Clean and speedup code in revert_unicode