Revert 1f0517a..adf3258

This rolls back to commit 1f0517a6f17e045b0e36a5d0436296de3ebd56de.
rolls back header id issue, tries again