Revert "new index"

This reverts commit 4fcea237b51e2ca924abdde59845b1ed50670785.
f