make aborting work in the new setup