diff --git a/cms/djangoapps/contentstore/__init__.py b/cms/djangoapps/contentstore/__init__.py
index e8dccbbf60..8b13789179 100644
--- a/cms/djangoapps/contentstore/__init__.py
+++ b/cms/djangoapps/contentstore/__init__.py
@@ -1,3 +1 @@
-from xmodule.templates import update_templates
 
-update_templates()
diff --git a/rakefile b/rakefile
index 15692d0d99..f62e75507c 100644
--- a/rakefile
+++ b/rakefile
@@ -440,6 +440,13 @@ namespace :cms do
   end
 end
 
+namespace :cms do
+  desc "Imports all the templates from the code pack"
+  task :update_templates do
+    sh(django_admin(:cms, :dev, :update_templates))
+  end
+end
+
 namespace :cms do
   desc "Import course data within the given DATA_DIR variable"
   task :xlint do