Comment 4 for bug 250652

I can, but only the whole branch with contains also other changes, which wouldn't be that useful :) Maybe I'll split the branch and send separate patches later.