Backed out changeset b032a90ee083 (bug 983489) for m-e10s test failures