This reverts commit fc011a72881cdddc95bfa61f3f38916c29b7e362. This reverts commit 4ad6a0c9a409b19b950a6a2a90d5405cea2e9b89. This reverts commit 4b1eb4cf0e8eff5f68410720167b4986da597010. Still causes Windows build bots to fail.
This reverts commit fc011a72881cdddc95bfa61f3f38916c29b7e362. This reverts commit 4ad6a0c9a409b19b950a6a2a90d5405cea2e9b89. This reverts commit 4b1eb4cf0e8eff5f68410720167b4986da597010. Still causes Windows build bots to fail.