Backed out changeset 749816a9c3fb (bug 1020416) for causing merge conflicts on a CLOSED TREE