diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 242a9099f..a1da3ffcf 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -171,7 +171,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
             $this->evm->dispatchEvent(Events::loadClassMetadata, $eventArgs);
         }
 
-        $this->wakeupReflection($class, $this->getReflectionService());
         $this->validateRuntimeMetadata($class, $parent);
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php
new file mode 100644
index 000000000..b9670d27a
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\Mapping\ClassMetadataFactory;
+
+/**
+ * @group DDC-2359
+ */
+class DDC2359Test extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Verifies that {@see \Doctrine\ORM\Mapping\ClassMetadataFactory::wakeupReflection} is
+     * not called twice when loading metadata from a driver
+     */
+    public function testIssue()
+    {
+        $mockDriver      = $this->getMock('Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriver');
+        $mockMetadata    = $this->getMock('Doctrine\\ORM\\Mapping\\ClassMetadata', array(), array(), '', false);
+        $entityManager   = $this->getMock('Doctrine\\ORM\\EntityManager', array(), array(), '', false);
+        /* @var $metadataFactory \Doctrine\ORM\Mapping\ClassMetadataFactory|\PHPUnit_Framework_MockObject_MockObject */
+        $metadataFactory = $this->getMock(
+            'Doctrine\\ORM\\Mapping\\ClassMetadataFactory',
+            array('newClassMetadataInstance', 'wakeupReflection')
+        );
+        $configuration   = $this->getMock('Doctrine\\ORM\\Configuration');
+        $connection      = $this->getMock('Doctrine\\DBAL\\Connection', array(), array(), '', false);
+
+        $configuration
+            ->expects($this->any())
+            ->method('getMetadataDriverImpl')
+            ->will($this->returnValue($mockDriver));
+        $entityManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
+        $entityManager->expects($this->any())->method('getConnection')->will($this->returnValue($connection));
+        $entityManager
+            ->expects($this->any())
+            ->method('getEventManager')
+            ->will($this->returnValue($this->getMock('Doctrine\\Common\\EventManager')));
+
+        $metadataFactory->expects($this->any())->method('newClassMetadataInstance')->will($this->returnValue($mockMetadata));
+        $metadataFactory->expects($this->once())->method('wakeupReflection');
+
+        $metadataFactory->setEntityManager($entityManager);
+
+        $this->assertSame($mockMetadata, $metadataFactory->getMetadataFor(__NAMESPACE__ . '\\DDC2359Foo'));
+    }
+}
+
+/** @Entity */
+class DDC2359Foo
+{
+    /** @Id @Column(type="integer") @GeneratedValue */
+    public $id;
+}
\ No newline at end of file