Backed out changeset 470c550c782b (bug 1115668) for breaking dt tests on a CLOSED TREE