Revert "Header differences"

This reverts commit 1f6ebac4d7d245a02e585cf7188324e007ba94ae.