Backed out changeset 221ca54f4df0 (bug 1092096) for m2 test failures