diff --git a/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp b/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp
--- a/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp  2015-03-31 11:27:38.000000000 +0200
+++ b/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp  2015-04-05 03:33:23.629774282 +0200
@@ -714,19 +714,7 @@
        PUSH_STATIC_BUFFER("\r\n");
    }

-   if (showVersionInHeader) {
-       #ifdef PASSENGER_IS_ENTERPRISE
-           PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " Enterprise " PASSENGER_VERSION "\r\n\r\n");
-       #else
-           PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " " PASSENGER_VERSION "\r\n\r\n");
-       #endif
-   } else {
-       #ifdef PASSENGER_IS_ENTERPRISE
-           PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " Enterprise\r\n\r\n");
-       #else
-           PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME "\r\n\r\n");
-       #endif
-   }
+   PUSH_STATIC_BUFFER("\r\n");

    nbuffers = i;
    return true;
diff --git a/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h b/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h
--- a/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h   2015-03-31 11:27:38.000000000 +0200
+++ b/ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h   2015-04-05 03:08:30.566884319 +0200
@@ -155,12 +155,6 @@
        }
        PUSH_STATIC_STRING("\r\n");

-       if (prep.showVersionInHeader) {
-           PUSH_STATIC_STRING("X-Powered-By: " PROGRAM_NAME " " PASSENGER_VERSION "\r\n");
-       } else {
-           PUSH_STATIC_STRING("X-Powered-By: " PROGRAM_NAME "\r\n");
-       }
-
        if (server->canKeepAlive(req)) {
            if (httpVersion < 1010) {
                // HTTP < 1.1 defaults to "Connection: close", but we want keep-alive
diff --git a/ext/nginx/ContentHandler.c b/ext/nginx/ContentHandler.c
--- a/ext/nginx/ContentHandler.c    2015-03-31 11:27:38.000000000 +0200
+++ b/ext/nginx/ContentHandler.c    2015-04-05 03:08:30.566884319 +0200
@@ -1177,19 +1177,7 @@

                 h->key.len = sizeof("Server") - 1;
                 h->key.data = (u_char *) "Server";
-                if (!passenger_main_conf.show_version_in_header) {
-                    if (clcf->server_tokens) {
-                        h->value.data = (u_char *) (NGINX_VER " + " PROGRAM_NAME);
-                    } else {
-                        h->value.data = (u_char *) ("nginx + " PROGRAM_NAME);
-                    }
-                } else {
-                    if (clcf->server_tokens) {
-                        h->value.data = (u_char *) (NGINX_VER " + " PROGRAM_NAME " " PASSENGER_VERSION);
-                    } else {
-                        h->value.data = (u_char *) ("nginx + " PROGRAM_NAME " " PASSENGER_VERSION);
-                    }
-                }
+                h->value.data = (u_char *) ("nginx");
                 h->value.len = ngx_strlen(h->value.data);
                 h->lowcase_key = (u_char *) "server";
             }