Reverted unneccessary changes in ChoiceValue, so it is easier to port back to the API.
Reverted unneccessary changes in ChoiceValue, so it is easier to port back to the API.

furore-fhir/spark,Illivion/spark,furore-fhir/spark,Illivion/spark,Illivion/spark,furore-fhir/spark