diff --git a/src/Admin.py b/src/Admin.py
index d7edac14b..3a76f3db5 100755
--- a/src/Admin.py
+++ b/src/Admin.py
@@ -134,7 +134,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg):
                ircdb.checkCapability(msg.prefix, 'admin'):
                 self.log.info('Invited to %s by %s.', channel, msg.prefix)
                 irc.queueMsg(ircmsgs.join(channel))
-                conf.supybot.channels().add(channel)
+                conf.supybot.networks.get(irc.network).channels().add(channel)
 
     def join(self, irc, msg, args):
         """<channel>[,<key>] [<channel>[,<key>] ...]
diff --git a/src/Owner.py b/src/Owner.py
index 30dd41ad4..80e1fbcd4 100644
--- a/src/Owner.py
+++ b/src/Owner.py
@@ -342,9 +342,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
         world.starting = False
 
     def do376(self, irc, msg):
-        channels = ircutils.IrcSet(conf.supybot.channels())
-        channels |= conf.supybot.networks.get(irc.network).channels()
-        channels = list(channels)
+        channels = list(conf.supybot.networks.get(irc.network).channels())
         if not channels:
             return
         utils.sortBy(lambda s: ',' not in s, channels)
diff --git a/src/conf.py b/src/conf.py
index 365e97a71..a5f1cf5d6 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -267,10 +267,6 @@ for (name, s) in registry._cache.iteritems():
             registerNetwork(name)
 
 
-registerGlobalValue(supybot, 'channels',
-    SpaceSeparatedSetOfChannels([], """Determines what channels the bot will
-    join when it connects to the server."""))
-
 ###
 # Reply/error tweaking.
 ###