Fixes #9408. Ensures that if we have a key that matches the index, that we fallback to using an indexed each block.
Dominic Gannaway