Revert r81576: The fact that there are two checks, one close to the inclusion and...