Undo Andy's careful work