Sayli has added support for cancel on a branch that is blocked by work Mike is doing.  When her branch is merged, we'll want to address this TODO:  No need to note this regression in this PR review comments.