Revert "Header updates"

This reverts commit 913976b310568343aceaaf0cf501220d5ab202c9.