diff --git a/changes/bug5097 b/changes/bug5097
new file mode 100644
index 0000000000..770e9b50ad
--- /dev/null
+++ b/changes/bug5097
@@ -0,0 +1,9 @@
+  o Minor bugfixes:
+
+    - Don't put "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200" in a
+      managed pluggable transport server proxy's environment.
+      Previously, we would put it there, even though Tor doesn't
+      implement an 'extended server port' yet, and even though Tor
+      almost certainly isn't listening to that address.  Bugfix on
+      0.2.3.6-alpha.
+
diff --git a/src/or/transports.c b/src/or/transports.c
index 3e5501e0e1..c7a63cbecb 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1087,8 +1087,6 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp)
                  router_get_advertised_or_port(options));
     tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=%s", bindaddr);
     tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", transports_to_launch);
-    /* XXX temp*/
-    tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200");
   } else {
     tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", transports_to_launch);
   }