This reverts commit cd778e00dc5362d00d4760c79fc301951f6f9b75. That commit introduced regressions for non-CJK languages are discussed in #8952. Fixes #9078.