Merge pull request #280 from behdad/revert-271-patch-2

Revert "use utf32"