diff --git a/cms/envs/common.py b/cms/envs/common.py
index e90d2b2139..e9f5455080 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -35,7 +35,8 @@ from path import path
 from lms.lib.xblock.mixin import LmsBlockMixin
 from cms.lib.xblock.mixin import CmsBlockMixin
 from xmodule.modulestore.inheritance import InheritanceMixin
-from xmodule.x_module import XModuleMixin, prefer_xmodules
+from xmodule.modulestore import prefer_xmodules
+from xmodule.x_module import XModuleMixin
 from dealer.git import git
 
 ############################ FEATURE CONFIGURATION #############################
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 769035b321..197e677b5f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -35,7 +35,8 @@ from .discussionsettings import *
 
 from lms.lib.xblock.mixin import LmsBlockMixin
 from xmodule.modulestore.inheritance import InheritanceMixin
-from xmodule.x_module import XModuleMixin, prefer_xmodules
+from xmodule.modulestore import prefer_xmodules
+from xmodule.x_module import XModuleMixin
 
 ################################### FEATURES ###################################
 # The display name of the platform to be used in templates/emails/etc.