diff --git a/lib/sass/script/functions.rb b/lib/sass/script/functions.rb
index 33e950d9..65e45b2c 100644
--- a/lib/sass/script/functions.rb
+++ b/lib/sass/script/functions.rb
@@ -60,7 +60,6 @@ module Sass::Script
     end
 
     instance_methods.each { |m| undef_method m unless m.to_s =~ /^__/ }
-    extend self
 
     # Creates a {Color} object from hue, saturation, and lightness
     # as per the CSS3 spec (http://www.w3.org/TR/css3-color/#hsl-color).
diff --git a/test/sass/functions_test.rb b/test/sass/functions_test.rb
index 9f1283b1..8b937797 100644
--- a/test/sass/functions_test.rb
+++ b/test/sass/functions_test.rb
@@ -92,7 +92,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def assert_rgb_hsl(rgb, hsl)
     hsl = hsl.map {|v| Sass::Script::Parser.parse v, 0, 0 }
-    assert_equal(rgb, Sass::Script::Functions.hsl(*hsl).value)
+    assert_equal(rgb, Sass::Script::Functions::EvaluationContext.new({}).hsl(*hsl).value)
   end
 
   def evaluate(value)