Backout changeset ce59241c232f for build bustage on a CLOSED TREE