Back out 7273dbeaeb88 (bug 157846) for mochitest and reftest bustage