removed findOne hack for previous wonky deferred behavior