Revert ugly fixes

Now that we have 6daf45e0, revert cryptic hacks...

This reverts commit abd81ed4f5cbc5a94171747909bc6b77551cb929.
This reverts commit 9c6921c08c905a0cf45ba0182134e6ff910fac51.
This reverts commit d39760cabfe4007cefdfc45231e85e93fababac2.
This reverts commit fedd8e6c176dea85194693399e50243eb1c117c4.

Fixes https://github.com/harfbuzz/harfbuzz/issues/1374
7 files changed