diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
index f6ef3070ca..8a9a75074f 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -59,13 +59,13 @@ class ValidatorExtension extends AbstractExtension
 
     public function loadTypeGuesser()
     {
-        // 2.4 API
-        if ($this->validator instanceof LegacyValidatorInterface) {
-            return new ValidatorTypeGuesser($this->validator->getMetadataFactory());
+        // 2.5 API
+        if ($this->validator instanceof ValidatorInterface) {
+            return new ValidatorTypeGuesser($this->validator);
         }
 
-        // 2.5 API - ValidatorInterface extends MetadataFactoryInterface
-        return new ValidatorTypeGuesser($this->validator);
+        // 2.4 API
+        return new ValidatorTypeGuesser($this->validator->getMetadataFactory());
     }
 
     protected function loadTypeExtensions()