This reverts commit 764d9aa9. This patch exposed a few additional cases where SCEV expressions are not properly invalidated. See PR52024, PR52023.