Undo some bad cleanup