Cancel before returning
Revert to the old cancelling behaviour