Remove bit about cli options workaround.