diff --git a/core/lib/Drupal/Component/Utility/EmailValidator.php b/core/lib/Drupal/Component/Utility/EmailValidator.php
index 8f9e511f63..691b09e9af 100644
--- a/core/lib/Drupal/Component/Utility/EmailValidator.php
+++ b/core/lib/Drupal/Component/Utility/EmailValidator.php
@@ -7,12 +7,12 @@
 /**
  * Validates email addresses.
  */
-class EmailValidator implements EmailValidatorInterface {
+class EmailValidator extends EmailValidatorUtility implements EmailValidatorInterface {
 
   /**
    * The email validator utility.
    *
-   * @var EmailValidator
+   * @var \Egulias\EmailValidator\EmailValidator
    */
   protected $emailValidator;
 
@@ -26,11 +26,4 @@ public function __construct(EmailValidatorUtility $emailValidator) {
     $this->emailValidator = $emailValidator;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function isValid($mail) {
-    return $this->emailValidator->isValid($mail);
-  }
-
 }
diff --git a/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php b/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php
index 7af301d10c..fe9eaaf3db 100644
--- a/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php
+++ b/core/lib/Drupal/Component/Utility/EmailValidatorInterface.php
@@ -7,15 +7,4 @@
  */
 interface EmailValidatorInterface {
 
-  /**
-   * Validates an email address.
-   *
-   * @param string $mail
-   *   A string containing an email address.
-   *
-   * @return bool
-   *   TRUE if the address is valid.
-   */
-  public function isValid($mail);
-
 }