Revert "NMS-5281 handle non-ASCII UTF-8 properly"

This reverts commit 69a54b7ee1d28b09cfe85ebd33de81b06ce35134.
Merge branch '1.12'