Backed out changeset b01c5df06269 (bug 841717) for causing bug 846106 on a CLOSED TREE