UTF-8 bugs
Revert "UTF-8 bugs"

This reverts commit 6162ccd8e446346eb72c5d4f8887595cc5ba1f5d.