Attempt to patch over the submodule disaster