close #15660
Comment out the weird workaround for building on Windows at it might not be needed anymore. Testing needed to confirm.