Revert "fixes potential issue with multi-byte chars"
This reverts commit a20134a9a4b692e4a202d83e6adbe4809ed733c8.