Revert "Remove "state_" auto-prepend in favor of index"

This reverts commit 942910c3975ea55071284d7cd341dcfce97dcc9d.