Backed out changeset 3d116167774f (bug 993004) for bustage on a CLOSED TREE