This reverts commit 1dac9b9f6b.
1dac9b9f6b
Common scripts for all Windows images regardless of Visual Studio or OS version