Revert "Merge pull request #1057 from cm-jan/issue-2751"

This reverts commit b6b5b14c991bdb45006ed3652275c35bbbf6d78c, reversing
changes made to 768ba172d5de5d4bf50c33f6c5e46056201ad9c3.
Remove previous utf8 fix
Merge pull request #1062 from njam/issue-1062

Revert invalid utf8 fix