Restored cancel-on-interrupt