Revert invalid utf8 fix