IDEA-103199 Undo: UTF problem (after-review improvements)
(cherry picked from commit 0a0aecf)