Comment 11 for bug 1141079

Thanks for checking! I'll submit a merge request for review then. Not sure if it's a proper 'fix', maybe more of a workaround - but at least it does not require reverting the whole commit that has been applied. Also, it seems to still fix the issues that it was supposed to fix (the code-path seems ok as well). But let's get it reviewed and discussed on the merge proposal.