revert Optional submodule on master branch for now