This reverts commit a9b4debe37. See the discussion on the original PR: https://github.com/doctrine/doctrine2/pull/434 Conflicts: lib/Doctrine/ORM/Configuration.php
a9b4debe37