Backed out changeset 42531d5e6ca2 (Bug 986843) for test failures