Revert "fdo#79372 fix hyphenation (remove fdo#56392 fix, except hard hyphen part)"

This reverts commit 259d3421d4cf7788d9099daa40fc181c661783ee.
fdo#79372, fdo#56392 fix hyphenation

Change-Id: Iacf84d023d3b4795892bc444299a29bfc663345e