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