Backed out changeset 6f476f02c21e (bug 940129) for build bustage on a CLOSED TREE