Backed out changesets 0b596070fe54 and ed6969e4fb6f (bug 957560) for causing bug 990027 on a CLOSED TREE.