Revert "NewIndex"

This reverts commit 922a5473925512dc78eff594eb8d755a6e62db83.
Revert "Revert "NewIndex""

This reverts commit a84c188bdce193044724195ef7dddc562554a788.