Backed out changeset 67b286d214e3 (bug 877072) for m1 test failures