Revert "Trying to fix immutable index"

This reverts commit 59978cc7c80b146a80beeb99919bad38f092e5b2.