Add choices back

@dhui @rbm