Backout cd9d6b4fb8c3 for mochitest failures.
With this, just incase there is a CLOSED TREE.