a workaround commit; remove multi-sort code