Undo Alan's changes to calculator.java