Comment # 3 on bug 1203982 from Reinhard Max

Committed the proposed fix from upstream to the devel project, and it passes
the test suite with no failures when building as given in comment 0.

Bernhard, please double-check before I submit to Factory.