Truncate more fields and revert back to 2.1 format.