This reverts commit 383ebc46947b0119123880c1ff9ae345fdb8d5f6. 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.