Revert the last 3 commits

That made no sense, we need to respect fontletterspace.