Backed out changeset 5b710d7fe073 (bug 850968) to see if it fixes bug 858588 on a CLOSED TREE.