Revert "New index"

This reverts commit 178e99147534ccb4b8f7d2caaf839e34f605bab9.