Now that there is only one option and not two, shouldn't the option just be enforce with a manifest-schema instead?