FIX Recent patch to DataObject#db changed API which broke core