Backporting updated promises for patched-v3.11.0