Revert "[unicode] Remove a few lines of cruft" This reverts commit d978c4b50aba750e568789593e689d272aaea59a. Ouch!