Revert "take 2"

This reverts commit 8113e3392b42dcf1ceb7bd81f3e04b0b8f20322e.
header take 3