Going back to Doctrine entity resolution. Broke a lot of things in this push. :-)