Revert "Validation for choice fields."

This reverts commit 33f9f6db70048e2028d9309446469ebdafa438af.