Revert some invalidation semantics back to what they were before the
merge of master.