Port away from addEnabledOption

Authored by mreeves on Mar 10 2020, 3:10 AM.