Backout changeset baf184596a7b for build errors on a CLOSED TREE.