Comment 85 for bug 1304001

FYI,

I've received information that this indeed fixes the described problem.

Thank you Stefan, Tim, Boris.