diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index b0a86ebd7..03bbd1cb7 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -651,7 +651,6 @@ class Bot(GroupMixin, discord.Client):
         for name, member in members:
             # register commands the cog has
             if isinstance(member, Command):
-                member.instance = cog
                 if member.parent is None:
                     self.add_command(member)
                 continue
@@ -699,7 +698,6 @@ class Bot(GroupMixin, discord.Client):
         for name, member in members:
             # remove commands the cog has
             if isinstance(member, Command):
-                member.instance = None
                 if member.parent is None:
                     self.remove_command(member.name)
                 continue
diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py
index ee525386a..b04cdabb0 100644
--- a/discord/ext/commands/core.py
+++ b/discord/ext/commands/core.py
@@ -163,6 +163,11 @@ class Command:
         finally:
             ctx.bot.dispatch('command_error', error, ctx)
 
+    def __get__(self, instance, owner):
+        if instance is not None:
+            self.instance = instance
+        return self
+
     @asyncio.coroutine
     def do_conversion(self, ctx, converter, argument):
         if converter is bool: