Revert "New Index"

This reverts commit d593afd325d810af64cd5f37f677bad8d6904611.