Backout 04695ce03bb6 (bug 836968) for topcrashing on a CLOSED TREE
Merge inbound and m-c