Revert r52158 per CR: was attempting to convert text to UTF-8 that was already UTF...