Fix UTF-8 broken on r61052