Can't we use `sortBundles` for this?