Revert my accidental revert in the optiona_types PR

Note to self, never merge/revert other pending PR.