Reverted windows build change from ThirdPartyWarnings merge