Backout bbcf9c812bb5:388e4a23e7fb (bug 1090636), for bustage on a CLOSED TREE