Back out 248daf8c6362 (bug 852915) for Win7 mochitest-1 orange