Do we still need this code in here if we're aborting the TaskSet?