diff --git a/CHANGES b/CHANGES
index a11ec3ed..3788f11f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 21 Mar 2007 - trunk
 -------------------
 
+* Removed CGI style HTTP_* variables in favor of REQUEST_HEADERS:Header-Name.
+
 * Store filename/line for each rule and display it and the ID (if available)
   in the debug log when invoking a rule.  Thanks to Christian Bockermann
   for the idea.
diff --git a/apache2/re.c b/apache2/re.c
index 5011e041..f21f3e4a 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -144,18 +144,6 @@ msre_var *msre_create_var_ex(apr_pool_t *pool, msre_engine *engine, const char *
         var->name = name;
     }
 
-    /* CGI HTTP variables emulation. */
-    if (strncasecmp(var->name, "HTTP_", 5) == 0) {    
-        if (var->param != NULL) {
-            *error_msg = apr_psprintf(pool, "Variable %s does not support parameters.",
-                var->name);
-            return NULL;
-        }
-        
-        var->param = var->name + 5;
-        var->name = "REQUEST_HEADERS";
-    }
-
     /* Resolve variable */
     var->metadata = msre_resolve_var(engine, var->name);
     if (var->metadata == NULL) {