We could try to implement our own simple dependency patching mechanism so we don't depend on git submodules anymore without needing full upstream support.