Backed out changeset 6f857407b64e (bug 1022612) for bustage on a CLOSED TREE