Bug 901402 fixed by kmroz, workaround not needed anymore