Revert cb0135e..d5f9178

This rolls back to commit cb0135e0ff4c0da7abc81042eb4ab0a9e15b0a1d.
Revert "Fixed index?"

This reverts commit cb0135e0ff4c0da7abc81042eb4ab0a9e15b0a1d.