This reverts r366142 (git commit 67cee1dc) The test is failing on the Windows buildbots. Reverting while I investigate. llvm-svn: 366144