Replace 'pop' with a better 'undo'