Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR #591)"

This reverts commit 8198f951d05302ec97c60e8679a24d53d3cb62c2, reversing
changes made to 23706c428be96ce5cb7d728c7cb9f1e904e01a80.