Sorry, everyone.
Ignore my patch. This was already fixed in HEAD and while I wrote mypatch for the HEAD I somehow failed to spot that it was already fixedwhen testing without my patch.
Nice that is fixed, and sorry for the noise.
Andreas