diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7bf4c158..4c000078 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -3083,7 +3083,7 @@ def _zipalign(unsigned_apk, aligned_apk):
         raise BuildException("Failed to align application")
 
 
-def apk_implant_signatures(apkpath, outpath, manifest, v2_files):
+def apk_implant_signatures(apkpath, outpath, manifest):
     """Implants a signature from metadata into an APK.
 
     :param apkpath: location of the unsigned apk
@@ -3091,18 +3091,17 @@ def apk_implant_signatures(apkpath, outpath, manifest, v2_files):
     """
 
     sigdir = os.path.dirname(manifest)  # FIXME
-    apksigcopier.do_patch(sigdir, apkpath, outpath, v1_only=v2_files is None)
+    apksigcopier.do_patch(sigdir, apkpath, outpath, v1_only=None)
 
 
-def apk_extract_signatures(apkpath, outdir, v1_only=None):
+def apk_extract_signatures(apkpath, outdir):
     """Extracts a signature files from APK and puts them into target directory.
 
     :param apkpath: location of the apk
     :param outdir: folder where the extracted signature files will be stored
-    :param v1_only: True for v1-only signatures, False for v1 and v2 signatures,
-                    or None for autodetection
+
     """
-    apksigcopier.do_extract(apkpath, outdir, v1_only=v1_only)
+    apksigcopier.do_extract(apkpath, outdir, v1_only=None)
 
 
 def get_min_sdk_version(apk):
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 445c15c9..29e90439 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -353,8 +353,7 @@ def main():
                 devsigned = '{}_{}_{}.apk'.format(appid, vercode, devfp)
                 devsignedtmp = os.path.join(tmp_dir, devsigned)
 
-                common.apk_implant_signatures(apkfile, devsignedtmp, manifest=manifest,
-                                              v2_files=v2_files)
+                common.apk_implant_signatures(apkfile, devsignedtmp, manifest=manifest)
                 if common.verify_apk_signature(devsignedtmp):
                     shutil.move(devsignedtmp, os.path.join(output_dir, devsigned))
                 else: