Comment 2 for bug 625076

I have linked a branch to this bug which attempts to fix the problem and requested a merge proposal to be reviewed by Kees, just to make sure the problem is being addressed securely.