Revert my accidental revert in the optiona_types PR
Merge pull request #813 from sklam/fix_missing_code

Revert my accidental revert in the optiona_types PR