Backed out changeset f6a3f2525323 (bug 1113811) for breaking lots of things on a CLOSED TREE