Revert "New index minor fix"

This reverts commit bf9387481cd51897b1da5585f1bc3609a62a9e87.