Revert of previous commit (more care has to be done regarding headers dynamicity)