Revert "new index"

This reverts commit a0e68841947b774be3b2f04eb657b0a83ab27bc8.