Revert "new index"

This reverts commit 3418701b2bc318874315e9b068993b877f01b7ca.