Comment 4 for bug 1171227

I am reluctant to apply this patch, mainly because it will likely break with v3.0 again - if you feel very strongly about it, please at least add a test for it, so there is a chance this will make it through.