I realize you're trying to be surgical, but this should really be refactored together with the other `abortStage` so they share most of the boiler-plate code.

Very cool patch.