Revert "new index"

This reverts commit f251214432da9363e1274337a5b710c8943e3128.