Rolled back header changes for now