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