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