Backed out changeset 8499eefa342e (bug 958868) for m2 test failures on a CLOSED TREE
Backed out changeset f809a67a796e (bug 958868) for m2 test failures on a CLOSED TREE