Remove polling from cancellation (bug 1037367)