Remove UTF-8 NFD conversion

We have iconv.