Remove polling from cancellation (bug 1037367)

I was confused about what's happening here but I think I understand it better. A shim is maybe not needed to make these tests more accurate.