This reverts commit e6c7ed6d. This commit was an attempt to fix the build bots, but it still left the clang-x64-windows-msvc bot in a broken state.