[#51098785]  Patch to return deferrable so we can chain code with callbacks