Backed out changeset faee77ddc112 (bug 935283) for mochitest-4 failures.