Backed out changeset 365053e73efa for build bustage on this CLOSED TREE.