This reverts commit 71623353.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.