Attempt to fix submodule weirdness