Comment 2 for bug 1852431

This bug has been in the codebase since at least 4.x. Since it took this long to get reported, I'm only going to merge the fix to 6.0. (It is a fairly safe fix so if someone feels strongly that it should be in 5.1.5 or 5.1.6, speak up.)