Backed out changeset 4d45bcf676f9 (bug 835722) for causing bug 843677 on a CLOSED TREE