Undo some more changes