This reverts commit 383ebc4694. We decided the xml for this feature needed more thought to make sure we are doing it the best way, in particular wrt option values that have multiple items.
383ebc4694