Backout f2d4762e07f9 for mochitest-other failures