Backed out changeset c0cf2e5d7c56 (bug 1013316)
Backed out changeset 91dad1e50118 (bug 891952) for m1 and m3 test failures on a CLOSED TREE