Revert "Stop using option groups for rate active/inactive flagging as it interferes with validation"

This reverts commit b02985cba8e5f50b0feddbc7b8924ed375b5c3e2.
We need to have a blank default, otherwise we will force a rate addition... forever.