diff --git a/apps/drupal/fastcgi_drupal.conf b/apps/drupal/fastcgi_drupal.conf
index c229046b..be59f851 100644
--- a/apps/drupal/fastcgi_drupal.conf
+++ b/apps/drupal/fastcgi_drupal.conf
@@ -27,9 +27,9 @@ fastcgi_param SCRIPT_FILENAME $document_root/index.php;
 ## later. The if_not_empty flag was introduced in 1.1.11.  See:
 ## http://nginx.org/en/CHANGES. If using a version that doesn't
 ## support this comment out the line below.
-fastcgi_param HTTPS $https if_not_empty;
+fastcgi_param HTTPS $fastcgi_https if_not_empty;
 ## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
-#fastcgi_param HTTPS $https;
+#fastcgi_param HTTPS $fastcgi_https;
 
 ## 2. Nginx FCGI specific directives.
 fastcgi_buffers 256 4k;
diff --git a/apps/drupal/fastcgi_no_args_drupal.conf b/apps/drupal/fastcgi_no_args_drupal.conf
index 4420d12c..683e4ceb 100644
--- a/apps/drupal/fastcgi_no_args_drupal.conf
+++ b/apps/drupal/fastcgi_no_args_drupal.conf
@@ -27,9 +27,9 @@ fastcgi_param SCRIPT_FILENAME $document_root/index.php;
 ## later. The if_not_empty flag was introduced in 1.1.11.  See:
 ## http://nginx.org/en/CHANGES. If using a version that doesn't
 ## support this comment out the line below.
-fastcgi_param HTTPS $https if_not_empty;
+fastcgi_param HTTPS $fastcgi_https if_not_empty;
 ## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
-#fastcgi_param HTTPS $https;
+#fastcgi_param HTTPS $fastcgi_https;
 
 ## 2. Nginx FCGI specific directives.
 fastcgi_buffers 256 4k;
diff --git a/fastcgi_params b/fastcgi_params
index 9c812ad5..ff643d35 100644
--- a/fastcgi_params
+++ b/fastcgi_params
@@ -27,6 +27,6 @@ fastcgi_param REDIRECT_STATUS 200;
 ## later. The if_not_empty flag was introduced in 1.1.11.  See:
 ## http://nginx.org/en/CHANGES. If using a version that doesn't
 ## support this comment out the line below.
-fastcgi_param HTTPS $https if_not_empty;
+fastcgi_param HTTPS $fastcgi_https if_not_empty;
 ## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
-#fastcgi_param HTTPS $https;
+#fastcgi_param HTTPS $fastcgi_https;
diff --git a/map_https_forwarded_proto.conf b/map_https_forwarded_proto.conf
deleted file mode 100644
index f5ff737a..00000000
--- a/map_https_forwarded_proto.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-map $http_x_forwarded_proto $https {
- default '';
- https on;
-}
diff --git a/nginx.conf b/nginx.conf
index c2d79f53..2da6d130 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -186,11 +186,12 @@ http {
     ## previous version then uncomment out the line below.
     #include map_https_fcgi.conf;
 
-    ## Include this line, if used in a loadbalanced environment
-    ## and comment the line which includes map_https_fcgi.conf.
-    ## If the loadbalancer always sends the request in http protocol,
-    ## and adds the server variable $http_x_forwarded_proto
-    #include map_https_forwarded_proto.conf;
+    # Support the X-Forwarded-Proto header for fastcgi.
+    map $http_x_forwarded_proto $fastcgi_https {
+      default $https;
+      http '';
+      https on;
+    }
 
     ## Include the upstream servers for Apache handling the PHP
     ## processes. In this case Nginx functions as a reverse proxy.