diff --git a/Rakefile b/Rakefile
index 41f62809..969c77d4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -36,14 +36,14 @@ e = Echoe.new("mongrel") do |p|
     when /mswin/
       self.files += ['lib/http11.so']
       self.platform = Gem::Platform::CURRENT
-      add_dependency('cgi_multipart_eof_fix', '>= 2.4')
+      # add_dependency('cgi_multipart_eof_fix', '>= 2.4')
     when /java/
       self.files += ['lib/http11.jar']
       self.platform = 'jruby' # XXX Is this right?
     else
       add_dependency('daemons', '>= 1.0.3')
-      add_dependency('fastthread', '>= 1.0.1')
-      add_dependency('cgi_multipart_eof_fix', '>= 2.4')
+      # add_dependency('fastthread', '>= 1.0.1')
+      # add_dependency('cgi_multipart_eof_fix', '>= 2.4')
     end
   end
 
@@ -134,8 +134,8 @@ end
 desc "Package Mongrel and all subprojects"
 task :package_all => [:package] do
   sub_project("gem_plugin", :package)
-  sub_project("cgi_multipart_eof_fix", :package)
-  sub_project("fastthread", :package)
+  # sub_project("cgi_multipart_eof_fix", :package)
+  # sub_project("fastthread", :package)
   sub_project("mongrel_status", :package)
   sub_project("mongrel_upload_progress", :package)
   sub_project("mongrel_console", :package)
@@ -152,8 +152,8 @@ end
 task :install_requirements do
   # These run before Mongrel is installed
   sub_project("gem_plugin", :install)
-  sub_project("cgi_multipart_eof_fix", :install)
-  sub_project("fastthread", :install)
+  # sub_project("cgi_multipart_eof_fix", :install)
+  # sub_project("fastthread", :install)
 end
 
 desc "for Mongrel and all subprojects"
@@ -170,11 +170,11 @@ end
 desc "for Mongrel and all its subprojects"
 task :uninstall => [:clean] do
   sub_project("mongrel_status", :uninstall)
-  sub_project("cgi_multipart_eof_fix", :uninstall)
+  # sub_project("cgi_multipart_eof_fix", :uninstall)
   sub_project("mongrel_upload_progress", :uninstall)
   sub_project("mongrel_console", :uninstall)
   sub_project("gem_plugin", :uninstall)
-  sub_project("fastthread", :uninstall)
+  # sub_project("fastthread", :uninstall)
   # sub_project("mongrel_experimental", :uninstall)
   sub_project("mongrel_service", :uninstall) if RUBY_PLATFORM =~ /mswin/
 end
@@ -182,8 +182,8 @@ end
 desc "for Mongrel and all its subprojects"
 task :clean do
   sub_project("gem_plugin", :clean)
-  sub_project("cgi_multipart_eof_fix", :clean)
-  sub_project("fastthread", :clean)
+  # sub_project("cgi_multipart_eof_fix", :clean)
+  # sub_project("fastthread", :clean)
   sub_project("mongrel_status", :clean)
   sub_project("mongrel_upload_progress", :clean)
   sub_project("mongrel_console", :clean)
diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb
index e643025a..8b8d5f66 100644
--- a/lib/mongrel/handlers.rb
+++ b/lib/mongrel/handlers.rb
@@ -205,11 +205,11 @@ module Mongrel
       # test to see if this is a conditional request, and test if
       # the response would be identical to the last response
       same_response = case
-                      when modified_since && !last_response_time = Time.httpdate(modified_since) rescue nil : false
-                      when modified_since && last_response_time > Time.now                                  : false
-                      when modified_since && mtime > last_response_time                                     : false
-                      when none_match     && none_match == '*'                                              : false
-                      when none_match     && !none_match.strip.split(/\s*,\s*/).include?(etag)              : false
+                      when modified_since && !last_response_time = Time.httpdate(modified_since) rescue nil then false
+                      when modified_since && last_response_time > Time.now                                  then false
+                      when modified_since && mtime > last_response_time                                     then false
+                      when none_match     && none_match == '*'                                              then false
+                      when none_match     && !none_match.strip.split(/\s*,\s*/).include?(etag)              then false
                       else modified_since || none_match  # validation successful if we get this far and at least one of the header exists
                       end