Backed out changeset 73af05ec57fc (bug 950503) for build bustage on a CLOSED TREE