Backed out changeset 4bb843a74b5b (bug 893572) for test failures on a CLOSED TREE