Reverted changes to Doctrine_Query & Doctrine_Query_Abstract