This reverts r358452 (git commit c8df4fb9) A dependent commit breaks the Windows buildbots. llvm-svn: 358460