Revert secondary header ID removal commit