Undo #22524