This is a clone of bug 474828; if we do include that change in 4.9, we'll have to do it in 5.4 also to prevent regressions across an upgrade.
*** This bug has been marked as a duplicate of bug 479806 ***