Revert buggy invalidation