Add TODO: add ability to disable header munging