This reverts commit r325915. It will take some time to fix the failures on a windows host. llvm-svn: 325929