Revert of revert of TLV renumbering (hrr). Now we can process incoming packets with 'known' state faster.