Backed out changeset 5206957b4f83 (bug 940506) for build bustage on a CLOSED TREE