Revert "Header Changes"

This reverts commit bb0db1bd99a06740f2bc2cea2e9fb7c94a190c1c.