IDEA-103199 Undo: UTF problem
(cherry picked from commit ea49ecf)
(cherry picked from commit 75ed596)