Reverted TLV ordering change; it was not sensible.