Reverted a couple of Unicode-related changes which are actually proving necessary on Windows.