Hopefully correct the whole git submodule mess.