Comment 20 for bug 487435

> Nadia, do you have a branch for this so I can merge it?
>
No it wasn't pushed to any branch. It was just a proposed fix that I didn't
try myself since I was busy, but I'm almost certain it should work.