Core part of this pull request - it is no longer a reason not to keep scanning.