Backout d62218c74497 (bug 826673) for crashes on a CLOSED TREE