Revert invariant removing with explanation comment.