diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go
index 056a19422..eb0f63e8e 100644
--- a/caddyhttp/proxy/reverseproxy.go
+++ b/caddyhttp/proxy/reverseproxy.go
@@ -25,7 +25,6 @@ import (
 	"golang.org/x/net/http2"
 
 	"github.com/mholt/caddy/caddyhttp/httpserver"
-	"github.com/mholt/caddy/caddyhttp/staticfiles"
 )
 
 var (
@@ -121,7 +120,8 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
 		}
 
 		// We should remove the `without` prefix at first.
-		untouchedPath, _ := req.Context().Value(staticfiles.URLPathCtxKey).(string)
+		// TODO(mholt): See #1582 (and below)
+		// untouchedPath, _ := req.Context().Value(staticfiles.URLPathCtxKey).(string)
 		if without != "" {
 			req.URL.Path = strings.TrimPrefix(req.URL.Path, without)
 			if req.URL.Opaque != "" {
@@ -130,9 +130,10 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
 			if req.URL.RawPath != "" {
 				req.URL.RawPath = strings.TrimPrefix(req.URL.RawPath, without)
 			}
-			if untouchedPath != "" {
-				untouchedPath = strings.TrimPrefix(untouchedPath, without)
-			}
+			// TODO(mholt): See #1582 (and above)
+			// if untouchedPath != "" {
+			// 	untouchedPath = strings.TrimPrefix(untouchedPath, without)
+			// }
 		}
 
 		// prefer returns val if it isn't empty, otherwise def