diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
index 7bee72d..be0b97a 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
@@ -76,7 +76,7 @@ public function validate($value, Constraint $constraint) {
       // permission nor can access this URI.
       $allowed = $this->current_user->hasPermission('link to any page') || $url->access();
       if (!$allowed) {
-        $this->context->addViolation($constraint->message, array('@uri' => LinkWidget::getUriAsDisplayableString($value->uri)));
+        $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
       }
     }
   }
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
index 4b6b7e0..881c66e 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
@@ -10,11 +10,11 @@
 use Symfony\Component\Validator\Constraint;
 
 /**
- * Defines an protocol validation constraint for links to external URLs.
+ * Defines a protocol validation constraint for links to external URLs.
  *
  * @Plugin(
  *   id = "LinkExternalProtocols",
- *   label = @Translation("No harmful external protocols", context = "Validation"),
+ *   label = @Translation("No dangerous external protocols", context = "Validation"),
  * )
  */
 class LinkExternalProtocolsConstraint extends Constraint {
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
index 42a0618..31746e5 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
@@ -40,13 +40,14 @@ public function validate($value, Constraint $constraint) {
       try {
         /** @var \Drupal\Core\Url $url */
         $url = $value->getUrl();
-      } // If the URL is malformed this constraint cannot check further.
+      }
+      // If the URL is malformed this constraint cannot check further.
       catch (\InvalidArgumentException $e) {
         return;
       }
       // Disallow external URLs using untrusted protocols.
       if ($url->isExternal() && !in_array(parse_url($url->getUri(), PHP_URL_SCHEME), UrlHelper::getAllowedProtocols())) {
-        $this->context->addViolation($constraint->message, array('@uri' => LinkWidget::getUriAsDisplayableString($value->uri)));
+        $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
       }
     }
   }
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
index d21e75b..3bcbb98 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Validator\Constraint;
 
 /**
- * Defines an protocol validation constraint for links to broken internal URLs.
+ * Defines a protocol validation constraint for links to broken internal URLs.
  *
  * @Plugin(
  *   id = "LinkNotExistingInternal",
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
index 80b0b29..19fce8c 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
@@ -40,7 +40,8 @@ public function validate($value, Constraint $constraint) {
       try {
         /** @var \Drupal\Core\Url $url */
         $url = $value->getUrl();
-      } // If the URL is malformed this constraint cannot check further.
+      }
+      // If the URL is malformed this constraint cannot check further.
       catch (\InvalidArgumentException $e) {
         return;
       }
@@ -54,7 +55,7 @@ public function validate($value, Constraint $constraint) {
           $allowed = FALSE;
         }
         if (!$allowed) {
-          $this->context->addViolation($constraint->message, array('@uri' => LinkWidget::getUriAsDisplayableString($value->uri)));
+          $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
         }
       }
     }