Again fiddling with the git submodules