Revert hack and fix to UTF8