Removing manual formatChoice procesing during validation. Fixes GEOS-6666.