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