Merge "Revert "Prioritize non-slices over slices"" into main