diff --git a/src/main/java/org/torproject/android/service/OrbotService.java b/src/main/java/org/torproject/android/service/OrbotService.java
index 17c5f0ec57080e1c33676af7713fa648c4020d74..6921aa1217aafc46e5dd13746f77ddc0d85d9715 100644
--- a/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/src/main/java/org/torproject/android/service/OrbotService.java
@@ -824,20 +824,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
                 }
 
             boolean success = runTorShellCmd();
-
-            if (success) {
-                try {
-                    updateLegacyV2OnionNames();
-                } catch (SecurityException se) {
-                    logNotice("unable to upload legacy v2 onion names");
-                }
-                try {
-                    updateV3OnionNames();
-                } catch (SecurityException se) {
-                    logNotice("unable to upload v3 onion names");
-                }
-            }
-
         } catch (Exception e) {
             logException("Unable to start Tor: " + e.toString(), e);
             stopTorAsync();
@@ -1388,12 +1374,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             showToolbarNotification(getString(R.string.your_relay_settings_caused_an_exception_), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
             return null;
         }
-
-        ContentResolver contentResolver = getApplicationContext().getContentResolver();
-        addV3OnionServicesToTorrc(extraLines, contentResolver);
-        addV3ClientAuthToTorrc(extraLines, contentResolver);
-        addV2HiddenServicesToTorrc(extraLines, contentResolver);
-        addV2ClientCookiesToTorrc(extraLines, contentResolver);
         return extraLines;
     }