Revert everything to r171366 to try to fix the build.