Back out 3be3bb423482 (bug 970746) for mochitest-1 bustage