am 087077bf: Make sure a "Cancel" is honored

* commit '087077bf2f484efa86c78326ccf8e76e9ddff4ed':
  Make sure a "Cancel" is honored