backout d4bf4c76854e for causing mochitest-other failures