and back again to the submodule based approach for patching dependencies