Revert "Locale support using libiconv and libicu, cosmetic improvements"

I'll create a pull request foir this

This reverts commit d3fa4e813c6c0e181d9efd207765f37e79bceddc.
Merge remote-tracking branch 'upstream/master' into master5