Wow. Backporting 3f1b089f70b9e14fc5ba41310a884a20358c12c5 seems to fix the issue (plus some hacking to get the patch working on the older version). I'll start working on a proper SRU.
Wow. fc5ba41310a884a 20358c12c5 seems to fix the issue (plus some hacking to get the patch working on the older version).
Backporting 3f1b089f70b9e14
I'll start working on a proper SRU.