Revert "unicode issue fix"

This reverts commit 4f09ecd21d816e937dc1b7e44ff76c9517388ebd.