Prevent PromiseProxy from re-throwing.

Fixes poor merge-conflict resolution.

This behavior has been changed on master (for the future 1.4.0 track), but the
current beta cycle (1.3.0) expects this to not be re-thrown.