Revert "revert unicode stuff"

This reverts commit 8c475240455b39d035ed6eec05fa24379aa1a977.