Revert "Fixed cancel() not working correctly"

This reverts commit 656b2d4331038fa730c688a4cd54e02391b07b2e.