Revert utf8 fix