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