undo some experimental changes