diff --git a/playbooks/roles/gerrit/templates/gerrit.vhost.j2 b/playbooks/roles/gerrit/templates/gerrit.vhost.j2
index 817e1f2420..94e5e615d0 100644
--- a/playbooks/roles/gerrit/templates/gerrit.vhost.j2
+++ b/playbooks/roles/gerrit/templates/gerrit.vhost.j2
@@ -55,6 +55,8 @@
   ProxyPreserveHost on
   ProxyStatus On
 
+  # TODO remove this when upgrading to Gerrit 2.16. /p/ is used
+  # for project dashboards.
   ProxyPassMatch ^/p/ !
   ProxyPassMatch ^/robots.txt$ !
   ProxyPassMatch ^/server-status !
@@ -63,9 +65,8 @@
 
   Alias /robots.txt /home/gerrit2/review_site/static/robots.txt
 
-  SetEnv GIT_PROJECT_ROOT /opt/lib/git
-  SetEnv GIT_HTTP_EXPORT_ALL
-
+  # TODO remove this when upgrading to Gerrit 2.16. /p/ is used
+  # for project dashboards.
   RewriteRule "^/p/.*" "-" [F,L]
 
   <Directory /home/gerrit2/review_site/git/>