Don't leave the battlefield in the rush to escape

Ideally extract out into separate function (even mixin) but didn't want to end up with merge conflicts