Partially back out commit from Dec 5

It works in my instance.  No getObject() methods anywhere found on head of doctrine.