diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb
index ae4f5b95..bf12d98f 100644
--- a/lib/compass/configuration.rb
+++ b/lib/compass/configuration.rb
@@ -2,7 +2,6 @@ require 'singleton'
 
 module Compass
   class Configuration
-    include Singleton
 
     ATTRIBUTES = [
       :project_type,
@@ -295,10 +294,11 @@ module Compass
 
   module ConfigHelpers
     def configuration
+      @configuration ||= Configuration.new
       if block_given?
-        yield Configuration.instance
+        yield @configuration
       end
-      Configuration.instance
+      @configuration
     end
 
     def sass_plugin_configuration