Revert "New Index"

This reverts commit be55816ab1abab5f19aac3d1a66da010883b8d12.