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