Rolled back the changes for ordering by matching origin (species name or common name) because a bug was introduced.
References #18977, #15644