Go back to built in submodule support to remove a possible source of breakage