Re-enable sort on pickup, make it more tolerant to timing.