Backout changeset c1021b0b890c, as the corresponding mozilla-central patch was also backed out to help unbreak a CLOSED TREE.