Revert "simple header handling"

This reverts commit c0cde657a453535205b0bc924b4df77a2938fc4b.