Revert "revert that last header configuration change because this way looks cleaner and works."

This reverts commit 4744737c19557373d90b8642a7b3b566db9ef40e.