Revert "index roll back"

This reverts commit bf4568703753d5d653c3771f8b9492876cf613da.