Backed out changesets 5b48376ee2d8 and 2f478d634f23 (bug 943023) for bustage on a CLOSED TREE.