Revert deleting auto-invalidation