Reverted h4 incompatibilities

The jdurgin upstream changes we applied a while back did not merge clean with
h4.

Not-in-upstream: true