Also should revert this. I moved HeaderComparison to a test namespace as this is only ever used for testing, and probably nobody uses it but me.