diff --git a/src/Symfony/Component/Form/FormFactoryBuilder.php b/src/Symfony/Component/Form/FormFactoryBuilder.php
index bccb86f40791d..759affa3c02f1 100644
--- a/src/Symfony/Component/Form/FormFactoryBuilder.php
+++ b/src/Symfony/Component/Form/FormFactoryBuilder.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Form;
 
+use Symfony\Component\Form\Extension\Core\CoreExtension;
+
 /**
  * The default implementation of FormFactoryBuilderInterface.
  *
@@ -18,6 +20,8 @@
  */
 class FormFactoryBuilder implements FormFactoryBuilderInterface
 {
+    private $forceCoreExtension;
+
     /**
      * @var ResolvedFormTypeFactoryInterface
      */
@@ -43,6 +47,14 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface
      */
     private $typeGuessers = [];
 
+    /**
+     * @param bool $forceCoreExtension
+     */
+    public function __construct($forceCoreExtension = false)
+    {
+        $this->forceCoreExtension = $forceCoreExtension;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -144,6 +156,21 @@ public function getFormFactory()
     {
         $extensions = $this->extensions;
 
+        if ($this->forceCoreExtension) {
+            $hasCoreExtension = false;
+
+            foreach ($extensions as $extension) {
+                if ($extension instanceof CoreExtension) {
+                    $hasCoreExtension = true;
+                    break;
+                }
+            }
+
+            if (!$hasCoreExtension) {
+                array_unshift($extensions, new CoreExtension());
+            }
+        }
+
         if (\count($this->types) > 0 || \count($this->typeExtensions) > 0 || \count($this->typeGuessers) > 0) {
             if (\count($this->typeGuessers) > 1) {
                 $typeGuesser = new FormTypeGuesserChain($this->typeGuessers);
diff --git a/src/Symfony/Component/Form/Forms.php b/src/Symfony/Component/Form/Forms.php
index 7c61d640e21ca..b66db7cf0865d 100644
--- a/src/Symfony/Component/Form/Forms.php
+++ b/src/Symfony/Component/Form/Forms.php
@@ -105,10 +105,7 @@ public static function createFormFactory()
      */
     public static function createFormFactoryBuilder()
     {
-        $builder = new FormFactoryBuilder();
-        $builder->addExtension(new CoreExtension());
-
-        return $builder;
+        return new FormFactoryBuilder(true);
     }
 
     /**