diff --git a/protocols/clientbot.py b/protocols/clientbot.py
index 9660508..0da9874 100644
--- a/protocols/clientbot.py
+++ b/protocols/clientbot.py
@@ -891,13 +891,6 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
         """
         self.send('PONG :%s' % args[0], queue=False)
 
-    def handle_pong(self, source, command, args):
-        """
-        Handles incoming PONG.
-        """
-        if source == self.uplink:
-            self.lastping = time.time()
-
     def handle_privmsg(self, source, command, args):
         """Handles incoming PRIVMSG/NOTICE."""
         # <- :sender PRIVMSG #dev :afasfsa
diff --git a/protocols/ircs2s_common.py b/protocols/ircs2s_common.py
index ae1c976..0bb8bd3 100644
--- a/protocols/ircs2s_common.py
+++ b/protocols/ircs2s_common.py
@@ -175,6 +175,11 @@ class IRCCommonProtocol(IRCNetwork):
         """Handles ERROR messages - these mean that our uplink has disconnected us!"""
         raise ProtocolError('Received an ERROR, disconnecting!')
 
+    def handle_pong(self, source, command, args):
+        """Handles incoming PONG commands."""
+        if source == self.uplink:
+            self.lastping = time.time()
+
     def handle_005(self, source, command, args):
         """
         Handles 005 / RPL_ISUPPORT. This is used by at least Clientbot and ngIRCd (for server negotiation).
@@ -490,11 +495,6 @@ class IRCS2SProtocol(IRCCommonProtocol):
 
         return {'channels': channels, 'text': reason}
 
-    def handle_pong(self, source, command, args):
-        """Handles incoming PONG commands."""
-        if source == self.uplink:
-            self.lastping = time.time()
-
     def handle_privmsg(self, source, command, args):
         """Handles incoming PRIVMSG/NOTICE."""
         # TS6: