Backed out changeset 1d058cefd04f (bug 1092096) for m2 test failures