Revert "More changes to index"

This reverts commit c0e786a62eb26664b57e4fe61d2fb97c1a00e93b.