Backout bdf4eeccfb41 (bug 813867) and d0c9d7c63b36 (bug 827274) for mochitest-oth orange.