foo.diff

diff --git a/django/db/models/manager.py b/django/db/models/manager.py
index 4a080e9..fa1e870 100644
--- a/django/db/models/manager.py
+++ b/django/db/models/manager.py
@@ -190,10 +190,9 @@ class BaseManager(six.with_metaclass(RenameManagerMethods)):
         # understanding of how this comes into play.
         return self.get_queryset()
 
-Manager = BaseManager.from_queryset(QuerySet, class_name='Manager')
 
-# FIXME: Remove once we get rid of RenameManagerMethods (DeprecationWarning).
-Manager.__module__ = 'django.db.models.manager'
+class Manager(BaseManager.from_queryset(QuerySet)):
+    pass
 
 
 class ManagerDescriptor(object):