Back out 0529fb43bd5f (bug 1047076) for bustage on a CLOSED TREE