Backed out changeset f5fa8ea86d3b (bug 622859)
Backed out changeset 3afdc3253979 (bug 622859) for breaking m1 tests