Reverting index name validation

Closes #1017