Revert "New index"

This reverts commit 30d3f8937268267e59478eeae292bfe6204091d9.