The clang Windows bots are showing mysterious failures. Reverting until I can figure out what's going on. llvm-svn: 238744