Comment out the weird workaround for building on Windows at it might not be needed anymore. Testing needed to confirm. (cherry picked from commit edbc0c0d0b)
edbc0c0d0b