Revert "new index"

This reverts commit 6637bb97e9bc79e07987114384fb2e16f1ee3cee.