Revert "Clean up index assignments and comparators"

This reverts commit 6c579ef0eb396bae246e15925289c1e0fa9d8036.

Reason for revert: b/240857315

Change-Id: I6302bc24dd61bd59f900962fb3392f941e30c241
3 files changed