diff --git a/CHANGES b/CHANGES
index 8ac9be07e3..b4858ae16b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_setenvif: Remove "support" for Remote_User variable which
+     never worked at all. PR 25725.  [André Malo]
+
   *) minor mod_auth_basic and mod_auth_digest sync.  mod_auth_basic
      now populates r->user with the (possibly unauthenticated) user,
      and mod_auth_digest returns 500 when a provider returns
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index f6e4d85739..558bc44cc7 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -162,9 +162,6 @@ respect to case</td></tr>
       on which the request was received (only with versions later
       than 2.0.43)</li>
 
-      <li><code>Remote_User</code> - the authenticated username (if
-      available)</li>
-
       <li><code>Request_Method</code> - the name of the method
       being used (<code>GET</code>, <code>POST</code>, <em>et
       cetera</em>)</li>
diff --git a/docs/manual/mod/mod_setenvif.html.ja.jis b/docs/manual/mod/mod_setenvif.html.ja.jis
index f8217a1d0d..3935131ffc 100644
--- a/docs/manual/mod/mod_setenvif.html.ja.jis
+++ b/docs/manual/mod/mod_setenvif.html.ja.jis
@@ -164,9 +164,6 @@
       $B%j%/%(%9%H$r<u$1<h$C$?%5!<%P$N(B IP $B%"%I%l%9(B
       (2.0.43 $B0J9_$N$_(B)</li>
 
-      <li><code>Remote_User</code> -
-      $BG'>Z$5$l$?%f!<%6L>(B ($B$b$7$"$l$P(B)</li>
-
       <li><code>Request_Method</code> -
       $B;HMQ$5$l$F$$$k%a%=%C%IL>(B (<code>GET</code>, <code>POST</code>
       <em>$B$J$I(B</em>)</li>
@@ -205,7 +202,7 @@
       <li><code><em>varname</em>=<em>value</em></code></li>
     </ol>
 
-    <p>$B$N$I$l$+$N7A<0$K$J$j$^$9!#(B</p>
+    <p>$B$N$I$l$+$N7A<0$K$J$j$^(B$B$9!#(B</p>
 
     <p>$B:G=i$N7A<0$G$O!"CM$O(B "1" $B$K@_Dj$5$l$^$9!#(B
     $BFs$DL\$O$b$7CM$,Dj5A$5$l$F$$$l$P$=$l$r<h$j=|$-$^$9!#(B
diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index cd6d0cfc6a..0a1b365a8d 100644
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -156,9 +156,6 @@ respect to case</description>
       on which the request was received (only with versions later
       than 2.0.43)</li>
 
-      <li><code>Remote_User</code> - the authenticated username (if
-      available)</li>
-
       <li><code>Request_Method</code> - the name of the method
       being used (<code>GET</code>, <code>POST</code>, <em>et
       cetera</em>)</li>
diff --git a/docs/manual/mod/mod_setenvif.xml.ja b/docs/manual/mod/mod_setenvif.xml.ja
index c5e481a017..ff8e129cd2 100644
--- a/docs/manual/mod/mod_setenvif.xml.ja
+++ b/docs/manual/mod/mod_setenvif.xml.ja
@@ -157,9 +157,6 @@
       $B%j%/%(%9%H$r<u$1<h$C$?%5!<%P$N(B IP $B%"%I%l%9(B
       (2.0.43 $B0J9_$N$_(B)</li>
 
-      <li><code>Remote_User</code> -
-      $BG'>Z$5$l$?%f!<%6L>(B ($B$b$7$"$l$P(B)</li>
-
       <li><code>Request_Method</code> -
       $B;HMQ$5$l$F$$$k%a%=%C%IL>(B (<code>GET</code>, <code>POST</code>
       <em>$B$J$I(B</em>)</li>
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 2f19d7c96f..78eb5c76d6 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -53,7 +53,6 @@
  *			(analogous to SERVER_ADDR set in ap_add_common_vars())
  *   remote_host        Remote host name (if available)
  *   remote_addr        Remote IP address
- *   remote_user        Remote authenticated user (if any)
  *   request_method     Request method (GET, POST, etc)
  *   request_uri        Requested URI
  *
@@ -99,7 +98,6 @@ enum special {
     SPECIAL_NOT,
     SPECIAL_REMOTE_ADDR,
     SPECIAL_REMOTE_HOST,
-    SPECIAL_REMOTE_USER,
     SPECIAL_REQUEST_URI,
     SPECIAL_REQUEST_METHOD,
     SPECIAL_REQUEST_PROTOCOL,
@@ -333,9 +331,6 @@ static const char *add_setenvif_core(cmd_parms *cmd, void *mconfig,
         else if (!strcasecmp(fname, "remote_host")) {
             new->special_type = SPECIAL_REMOTE_HOST;
         }
-        else if (!strcasecmp(fname, "remote_user")) {
-            new->special_type = SPECIAL_REMOTE_USER;
-        }
         else if (!strcasecmp(fname, "request_uri")) {
             new->special_type = SPECIAL_REQUEST_URI;
         }
@@ -492,9 +487,6 @@ static int match_headers(request_rec *r)
                 val =  ap_get_remote_host(r->connection, r->per_dir_config,
                                           REMOTE_NAME, NULL);
                 break;
-            case SPECIAL_REMOTE_USER:
-                val = r->user;
-                break;
             case SPECIAL_REQUEST_URI:
                 val = r->uri;
                 break;