This reverts commit 53b3873c. Seems to break SupportTests.exe's ConvertUTFTest.UTF16WrappersForConvertUTF16ToUTF8String on Windows.