Avoid sorting based on id.

The order will soon be non-deterministic, so find another
way of sorting items

Change-Id: I272021d8886f692f996a824ba5ee4dedd88e4883