Workaround is no longer needed and causes trouble with cyrillic characters. This reverts commit 00142e4c.