revert a couple header changes for now