Reverted optionField command fields

Because our code depends on them.