--- a/process/factory.py
+++ b/process/factory.py
@@ -4793,18 +4793,17 @@ class ScriptFactory(RequestSortingBuildF
                  script_timeout=1200, script_maxtime=None, log_eval_func=None,
                  reboot_command=None, hg_bin='hg', platform=None,
                  use_mock=False, mock_target=None,
                  mock_packages=None, mock_copyin_files=None,
                  triggered_schedulers=None, env={}, copy_properties=None,
                  properties_file='buildprops.json', script_repo_cache=None,
                  tools_repo_cache=None, tooltool_manifest_src=None,
                  tooltool_bootstrap="setup.sh", tooltool_url_list=None,
-                 tooltool_script=None, relengapi_archiver_repo_path=None,
-                 relengapi_archiver_release_tag=None):
+                 tooltool_script=None, relengapi_archiver_repo_path=None):
         BuildFactory.__init__(self)
         self.script_timeout = script_timeout
         self.log_eval_func = log_eval_func
         self.script_maxtime = script_maxtime
         self.reboot_command = reboot_command
         self.platform = platform
         self.use_mock = use_mock
         self.mock_target = mock_target
@@ -4860,20 +4859,16 @@ class ScriptFactory(RequestSortingBuildF
         ))
         self.addStep(SetBuildProperty(
             property_name='script_repo_url',
             value=scriptRepo,
         ))
         script_repo_url = WithProperties('%(script_repo_url)s')
 
         if relengapi_archiver_repo_path:
-            if relengapi_archiver_release_tag:
-                archiver_revision = "--tag %s " % relengapi_archiver_release_tag
-            else:
-                archiver_revision = "--rev %(revision)s "
             if self.script_repo_cache:
                 assert self.tools_repo_cache
                 archiver_client_path = \
                     os.path.join(self.tools_repo_cache,
                                  'buildfarm',
                                  'utils',
                                  'archiver_client.py')
             else:
@@ -4896,17 +4891,17 @@ class ScriptFactory(RequestSortingBuildF
             ))
             self.addStep(ShellCommand(
                 name="download_and_extract_scripts_archive",
                 command=['bash', '-c',
                          WithProperties(
                              'python %s ' % archiver_client_path +
                              'mozharness ' +
                              '--repo %s ' % relengapi_archiver_repo_path +
-                             archiver_revision +
+                             '--rev %(revision)s ' +
                              '--destination scripts ' +
                              '--debug')],
                 log_eval_func=rc_eval_func({0: SUCCESS, None: EXCEPTION}),
                 haltOnFailure=True,
                 workdir=".",
             ))
             if scriptName.startswith('/'):
                 script_path = scriptName

--- a/process/release.py
+++ b/process/release.py
@@ -51,20 +51,16 @@ DEFAULT_PARALLELIZATION = 10
 
 
 def generateReleaseBranchObjects(releaseConfig, branchConfig,
                                  releaseConfigFile, sourceRepoKey="mozilla",
                                  secrets=None):
     # This variable is one thing that forces us into reconfiging prior to a
     # release. It should be removed as soon as nothing depends on it.
     sourceRepoInfo = releaseConfig['sourceRepositories'][sourceRepoKey]
-    # Bug 1179476 - use in gecko tree mozharness for release jobs
-    relengapi_archiver_repo_path = sourceRepoInfo['path']
-    if sourceRepoKey == "comm":
-        relengapi_archiver_repo_path = releaseConfig['sourceRepositories']['mozilla']['path']
     releaseTag = getReleaseTag(releaseConfig['baseTag'])
     # This tag is created post-signing, when we do some additional
     # config file bumps
     runtimeTag = getRuntimeTag(releaseTag)
     l10nChunks = releaseConfig.get('l10nChunks', DEFAULT_PARALLELIZATION)
     updateVerifyChunks = releaseConfig.get(
         'updateVerifyChunks', DEFAULT_PARALLELIZATION)
     # Re-use the same chunking configuration
@@ -908,18 +904,16 @@ def generateReleaseBranchObjects(release
                     extra_args = releaseConfig['single_locale_options'][platform] + ['--cfg', branchConfig['mozharness_configs']['balrog'], '--total-chunks', str(l10nChunks), '--this-chunk', str(n)]
                     repack_factory = SigningScriptFactory(
                         signingServers=getSigningServers(platform),
                         scriptRepo=mozharness_repo,
                         scriptName='scripts/mobile_l10n.py',
                         extra_args=extra_args,
                         use_credentials_file=True,
                         env=env,
-                        relengapi_archiver_repo_path=relengapi_archiver_repo_path,
-                        relengapi_archiver_release_tag=releaseTag,
                     )
                     properties['script_repo_revision'] = releaseTag
                 else:
                     extra_args = [platform, branchConfigFile]
                     extra_args.extend([
                         '--chunks', str(l10nChunks), '--this-chunk', str(n),
                         '--stage-ssh-key', branchConfig['stage_ssh_key'],
                         '--stage-server', branchConfig['stage_server'],
@@ -1108,18 +1102,16 @@ def generateReleaseBranchObjects(release
                     'partnerRepackConfig']['platforms'][platform]
                 extra_args = mh_cfg.get(
                     'extra_args', ['--cfg', mh_cfg['config_file']])
                 partner_repack_factory = ScriptFactory(
                     scriptRepo=mozharness_repo,
                     scriptName=mh_cfg['script'],
                     extra_args=extra_args,
                     env=builder_env,
-                    relengapi_archiver_repo_path=relengapi_archiver_repo_path,
-                    relengapi_archiver_release_tag=releaseTag,
                 )
             else:
                 pr_pf = branchConfig['platforms']['macosx64']
                 slaves = pr_pf['slaves']
                 repack_params = dict(
                     hgHost=branchConfig['hghost'],
                     repoPath=sourceRepoInfo['path'],
                     buildToolsRepoPath=tools_repo_path,
@@ -1400,18 +1392,16 @@ def generateReleaseBranchObjects(release
                         extra_args=[
                             '--cfg', 'generic_releng_config.py',
                             '--firefox-ui-branch', sourceRepoInfo['name'],
                             '--update-verify-config', updateConfig['verifyConfigs'][platform],
                             '--tools-tag', runtimeTag,
                             '--total-chunks', str(ui_update_verify_chunks),
                             '--this-chunk', str(n)
                         ],
-                        relengapi_archiver_repo_path=relengapi_archiver_repo_path,
-                        relengapi_archiver_release_tag=releaseTag,
                     )
 
                     builddir = '%(prefix)s_%(this_chunk)s' % {
                         'prefix': builderPrefix(postfix='%s_%s_update_tests' % (platform, channel)),
                         'this_chunk': str(n)
                     }
 
                     builders.append({
@@ -1733,18 +1723,16 @@ def generateReleaseBranchObjects(release
             prev_version = "%sbuild%s" % (partial, info["buildNumber"])
             extra_args.extend(["--previous-version", prev_version])
 
         bouncer_submitter_factory = ScriptFactory(
             scriptRepo=mozharness_repo,
             scriptName="scripts/bouncer_submitter.py",
             extra_args=extra_args,
             use_credentials_file=True,
-            relengapi_archiver_repo_path=relengapi_archiver_repo_path,
-            relengapi_archiver_release_tag=releaseTag,
         )
 
         builders.append({
             'name': builderPrefix('%s_bouncer_submitter' % releaseConfig['productName']),
             'slavenames': branchConfig['platforms']['linux']['slaves'] +
             branchConfig['platforms']['linux64']['slaves'],
             'category': builderPrefix(''),
             'builddir': builderPrefix('%s_bouncer_submitter' % releaseConfig['productName']),