We do not need gsb_make_overrides anymore.  So pull in the modules and remove the dependency.