diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index 18ead9536..98e3d77a0 100755
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -391,14 +391,6 @@ http {
 
     {{ end }}
 
-    {{ if $cfg.UseForwardedHeaders }}
-    map $http_x_forwarded_proto $full_x_forwarded_proto {
-        default $http_x_forwarded_proto;
-        "" $scheme;
-    }
-
-    {{ end }}
-
     # Create a variable that contains the literal $ character.
     # This works because the geo module will not resolve variables.
     geo $literal_dollar {
@@ -1216,13 +1208,9 @@ stream {
             {{ else }}
             {{ $proxySetHeader }} X-Forwarded-For        $remote_addr;
             {{ end }}
-            {{ if $all.Cfg.UseForwardedHeaders }}
-            {{ $proxySetHeader }} X-Forwarded-Proto      $full_x_forwarded_proto;
-            {{ else }}
-            {{ $proxySetHeader }} X-Forwarded-Proto      $pass_access_scheme;
-            {{ end }}
             {{ $proxySetHeader }} X-Forwarded-Host       $best_http_host;
             {{ $proxySetHeader }} X-Forwarded-Port       $pass_port;
+            {{ $proxySetHeader }} X-Forwarded-Proto      $pass_access_scheme;
             {{ if $all.Cfg.ProxyAddOriginalURIHeader }}
             {{ $proxySetHeader }} X-Original-URI         $request_uri;
             {{ end }}
diff --git a/test/e2e/settings/forwarded_headers.go b/test/e2e/settings/forwarded_headers.go
index 7c09a2406..13f7504cf 100644
--- a/test/e2e/settings/forwarded_headers.go
+++ b/test/e2e/settings/forwarded_headers.go
@@ -48,7 +48,7 @@ var _ = framework.DescribeSetting("use-forwarded-headers", func() {
 		f.WaitForNginxServer(host,
 			func(server string) bool {
 				return strings.Contains(server, "server_name forwarded-headers") &&
-					strings.Contains(server, "proxy_set_header X-Forwarded-Proto $full_x_forwarded_proto;")
+					strings.Contains(server, "proxy_set_header X-Forwarded-Proto $pass_access_scheme;")
 			})
 
 		ginkgo.By("ensuring single values are parsed correctly")