Conditionally undoing things was a bad idea