Add back skip_cleanup.