diff --git a/ChangeLog b/ChangeLog
index 3569f085c1..1d990d5929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 28 18:59:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
+	  and CGI_COOKIES.  they will no longer be used.
+
 Wed Jul 28 15:44:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): should call rb_call_super() directly for
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 3141d3d692..463b17d98a 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -2256,36 +2256,15 @@ class CGI
       Apache.request.setup_cgi_env
     end
 
+      (class << self; self; end).class_eval do
+        const_set(:CGI_PARAMS,  [1])
+        const_set(:CGI_COOKIES, [2])
+      end
+
     extend QueryExtension
     @multipart = false
-    if "POST" != env_table['REQUEST_METHOD']
-      initialize_query()  # set @params, @cookies
-    else
-      if defined?(CGI_PARAMS)
-        @params  = CGI_PARAMS.nil?  ? nil : CGI_PARAMS.dup
-        @cookies = CGI_COOKIES.nil? ? nil : CGI_COOKIES.dup
-      else
-        initialize_query()  # set @params, @cookies
-        params  = @params.nil?  ? nil : @params.dup
-        cookies = @cookies.nil? ? nil : @cookies.dup
-        (class << self; self; end).class_eval do
-          const_set(:CGI_PARAMS,  params)
-          const_set(:CGI_COOKIES, cookies)
-        end
-        if defined?(MOD_RUBY) and (RUBY_VERSION < "1.4.3")
-          raise "Please, use ruby1.4.3 or later."
-        else
-          at_exit() do
-            if defined?(CGI_PARAMS)
-              CGI.class_eval do
-                remove_const(:CGI_PARAMS)
-                remove_const(:CGI_COOKIES)
-              end
-            end
-          end
-        end
-      end
-    end
+
+    initialize_query()  # set @params, @cookies
     @output_cookies = nil
     @output_hidden = nil