This reverts commit bec8fc58.

It does not really solve the bad spacing issue and it broke handling of
trailing whitespace in right-to-left text.