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