Fix broken fix to broken utf-8 handling.