Revert "Hopefully fixed index"

This reverts commit d16e2d11e8ff174683f990487cda97f33141b0a5.
Revert "test"

This reverts commit 95bbb787db945746a8eb6ceb3f0d8ffca7308f3c.