Fixup bug 1084696 on a busted tree. r=me
Backout changeset 96baea8ac9ab and 85fb6b5bc62a (part of resp. bug 922912 and bug 609976) because it appears it has not been necessary for a while
Bug 1084210 - Simplify tree traversal for memory/replace. r=mshal