Get rid of RobustInterruption and all its problems.
Merge branch 'no_robust_interruption'