Revert "Removed the functionality where headers were renumbered. As it turned"

This reverts commit b80f7df26305c6c21274c0bed7a516ad6c870129.