Back out c237f02b3578 (bug 946296) because it broke mochitest-metro-chrome