Reintroduce automatic entity removal for legacy indexes
Merge pull request #3589 from chrisvest/2.2-legacy-index-entity-remove

Reintroduce automatic entity removal for legacy indexes