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

This reverts commit abd81ed4.
This reverts commit 9c6921c0.
This reverts commit d39760ca.
This reverts commit fedd8e6c.

Fixes https://github.com/harfbuzz/harfbuzz/issues/1374