rolled back unicode enhancement as it breaks more then it fixes