Sorting moved from Collector to Registry.

Change-Id: I3603f344eee5b6e9fa3596d86b6e9596232abc3b