HACK-587: revert changes for persistent header