Undo some debugging changes