Undo #1788