Comment 30 for bug 904072

Here's the patch backported to the stable branch.

Caveat: I'm having some late night weirdness with tests failing that have nothing to do with this patch, and continuing to fail after the patch is reverted. If someone could double-check that the tests pass, that'd be great.