am 312ba86b: Change task removal sequence

* commit '312ba86b476fa1d83864a7d465135cc9a4e94ad8':
  Change task removal sequence