Backout bug 994190 and merge over some stuff that landed afterwards on a CLOSED TREE.