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