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