Revert r194300 which broke the build.