Comment 4 for bug 780237

By the way, I think we should fix this in master once we have branched 1.4 off of master.

(It's a bit late in the development cycle to make a change that could potentially break a lot of sites.)