[3.8] Ensure sorter index is removed

Because of its uniqueness it prevents the reordering of fields.