Backout 471244c106e9:634be002dbc9 (bug 1012407)
Backout d6c58a2a6da4 (bug 1012407) for various bustages on a CLOSED TREE