How about I submit a separate PR for this since dropping it isn't related to windows support?