Revert "Add notion of persistent headers"

This reverts commit bb51ab4f6ac666933f4ff82890870ccccb55bace.
Persist headers, explicitly set by user only