Backed out changeset a7840102579b (bug 1052122) for causing regressions on a CLOSED TREE