Revert this CLOSED TREE to changeset 4d3e221584a0.