Backed out changeset 588a03cd4e27 (bug 1022434) for bustage on a CLOSED TREE