Comment 5 for bug 1496556

I came across this bug when checking for missing release notes. It looks like a bug fix to me, and I think it should be considered for backporting for 2.9 and 2.10. I'm going to apply targets so that the release maintainers can make the final decision on backporting.