Revert "Add temporary fix for DoctrineBundle"

This reverts commit 237fb04ebf95fa678df098e9f119335b53aa130b.

Rreason: fixed upstream.
Merge pull request #1346 from drak/revertservice

Revert "Add temporary fix for DoctrineBundle"