diff --git a/openstack_releases/cmds/get_deliverable_owner.py b/openstack_releases/cmds/get_deliverable_owner.py
index c11f1c4a69..780a83ff73 100644
--- a/openstack_releases/cmds/get_deliverable_owner.py
+++ b/openstack_releases/cmds/get_deliverable_owner.py
@@ -35,7 +35,6 @@ def main():
         root_dir=args.deliverables_dir,
         collapse_history=False,
     )
-    for entry in all_deliv.get_deliverable_history(args.deliverable):
-        deliv = deliverable.Deliverable(*entry)
+    for deliv in all_deliv.get_deliverable_history(args.deliverable):
         print(deliv.team)
         break
diff --git a/openstack_releases/deliverable.py b/openstack_releases/deliverable.py
index 020764efa0..a6046f2f04 100644
--- a/openstack_releases/deliverable.py
+++ b/openstack_releases/deliverable.py
@@ -191,8 +191,8 @@ class Deliverables(object):
         """Return info associated with a deliverable name.
         """
         for filename in self._by_deliverable_name.get(name, []):
-            yield (
-                None,
+            yield Deliverable(
+                None,  # team will be taken from the data
                 self._series_from_filename(filename),
                 self._deliverable_from_filename(filename),
                 self._by_filename.get(filename, {}),