Back out 75c95dac7fe0 (bug 984497) and f1b0d3d13755 (bug 990475) to fix bustage on a CLOSED TREE.

--HG--
extra : rebase_source : a63315cd428faeb95464f6ad76946d1c0c6d36c3