Merge "Revert "Add VISIT_RISKY_URIS flag."" into main