This reverts commit ed499a36 and addresses a problem causing a Windows build bot to hang. llvm-svn: 365592
mentioned in commit 9846a1f2