Backed out changeset e44bc308642a (bug 813901) and changeset 19f154ee6f54 (bug 850000) for bustage on a CLOSED TREE.