diff --git a/Gemfile.d/i18n_tools_and_rake_tasks.rb b/Gemfile.d/i18n_tools_and_rake_tasks.rb
index 3aefd50ace5..aad501fe26b 100644
--- a/Gemfile.d/i18n_tools_and_rake_tasks.rb
+++ b/Gemfile.d/i18n_tools_and_rake_tasks.rb
@@ -3,7 +3,7 @@ group :i18n_tools do
 
 end
 
-group :i18n_tools, :rake_tasks do
+group :i18n_tools, :development do
   gem 'i18n_tasks', :path => 'gems/i18n_tasks'
   gem 'handlebars_tasks', :path => 'gems/handlebars_tasks'
 end
diff --git a/Rakefile b/Rakefile
index ae6c165c57d..a97405d0d17 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,7 @@ end
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
-Bundler.require(:rake_tasks)
+Bundler.require(:i18n_tools)
 
 if CANVAS_RAILS2
   Dir["#{RAILS_ROOT}/gems/**/tasks/*.rake"].each { |ext| load ext }
diff --git a/gems/handlebars_tasks/lib/handlebars_tasks.rb b/gems/handlebars_tasks/lib/handlebars_tasks.rb
index 75b852f1191..b2295fb44bb 100644
--- a/gems/handlebars_tasks/lib/handlebars_tasks.rb
+++ b/gems/handlebars_tasks/lib/handlebars_tasks.rb
@@ -2,9 +2,6 @@ require "i18n_extraction"
 require "compass"
 require "sass/plugin"
 
-module HandlebarsTasks
-  require "handlebars_tasks/handlebars"
-  require "handlebars_tasks/ember_hbs"
-
-  require_relative "handlebars_tasks/railtie" if defined?(Rails) && CANVAS_RAILS3
-end
+require "handlebars_tasks/handlebars"
+require "handlebars_tasks/ember_hbs"
+require "handlebars_tasks/railtie" if defined?(Rails) && CANVAS_RAILS3