Fix for returnToNormal stays set when you cancel adding a step