Bug#868785: Fixes for excessive memory usage

[Phil Miller]

Control: affects -1 isenkram

Leaving a note on the symptomatic package bug list . . .