When an item gets sub-items, we have to run our own random-picking among
the new items.

Cherry-picked from commit: 2a4a8f9a