Comment 5 for bug 515740

I do not accept this update until bug 240519 gets verified. Since that one seems pretty much dead, it might be that we need to revert it, and reupload this fix without the 240519 change.