Revert "Prioritize non-slices over slices"

This reverts commit 14499f01192a7be146f6ec34db71101a11758ca5.

Reason for revert: b/312408745

Change-Id: I8b03799fe6e0e256263240909ee7446c178bf508
2 files changed