Revert "Try harder to avoid reindexing". This broke dirtying.

This reverts commit feec7db25bbac1eb4be604e5314301b0ee70effb.