Undo some debug changes