Reverting r222828 and r222810-r222812 as they broke the build on Windows.