diff --git a/src/main/java/eu/siacs/conversations/xmpp/Patches.java b/src/main/java/eu/siacs/conversations/xmpp/Patches.java
deleted file mode 100644
index 2332da1ca..000000000
--- a/src/main/java/eu/siacs/conversations/xmpp/Patches.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package eu.siacs.conversations.xmpp;
-
-
-import java.util.Arrays;
-import java.util.List;
-
-public class Patches {
-    public static final List<String> DISCO_EXCEPTIONS = Arrays.asList(
-            "nimbuzz.com"
-    );
-}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index abde8557f..a47613895 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1907,16 +1907,7 @@ public class XmppConnection implements Runnable {
         }
         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": starting service discovery");
         mPendingServiceDiscoveries.set(0);
-        if (!waitForDisco
-                || Patches.DISCO_EXCEPTIONS.contains(
-                        account.getJid().getDomain().toEscapedString())) {
-            Log.d(
-                    Config.LOGTAG,
-                    account.getJid().asBareJid() + ": do not wait for service discovery");
-            mWaitForDisco.set(false);
-        } else {
-            mWaitForDisco.set(true);
-        }
+        mWaitForDisco.set(waitForDisco);
         lastDiscoStarted = SystemClock.elapsedRealtime();
         mXmppConnectionService.scheduleWakeUpCall(
                 Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());