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