diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 44b210bc1c8109dae1bf38a086caff1042099ded..8d50890c6443e3a2b7bd13556f238eaf0e4b1582 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -23,19 +23,6 @@ THE SOFTWARE.
 -->
 
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-    <j:new var="h" className="hudson.Functions" /><!-- instead of JSP functions -->
-    <j:if test="${request.servletPath=='/' || request.servletPath==''}">
-        <st:header name="X-Hudson" value="1.395" />
-        <st:header name="X-Jenkins" value="${servletContext.getAttribute('version')}" />
-        <j:if test="${app.tcpSlaveAgentListener!=null}">
-            <!-- advertise the CLI TCP port -->
-            <st:header name="X-Hudson-CLI-Port" value="${app.tcpSlaveAgentListener.port}" />
-            <st:header name="X-Jenkins-CLI-Port" value="${app.tcpSlaveAgentListener.port}" />
-        </j:if>
-        <j:forEach var="pd" items="${h.pageDecorators}">
-            <st:include it="${pd}" page="httpHeaders.jelly" optional="true" />
-        </j:forEach>
-    </j:if>
     <l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}">
         <st:include page="sidepanel.jelly" />
         <l:main-panel>
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 5d4ee321d6dbfdd2737146b0970283ee79d5014c..cb505aec27279a13bcfeab4f1571a5d2fa405880 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -69,7 +69,19 @@ THE SOFTWARE.
 -->
 <j:set var="resURL"  value="${rootURL}${h.resourcePath}" />
 <j:set var="imagesURL"  value="${rootURL}${h.resourcePath}/images" />
-<html>
+  <j:if test="${request.servletPath=='/' || request.servletPath==''}">
+    <st:header name="X-Hudson" value="1.395"/>
+    <st:header name="X-Jenkins" value="${servletContext.getAttribute('version')}"/>
+    <j:if test="${app.tcpSlaveAgentListener!=null}">
+      <!-- advertise the CLI TCP port -->
+      <st:header name="X-Hudson-CLI-Port" value="${app.tcpSlaveAgentListener.port}"/>
+      <st:header name="X-Jenkins-CLI-Port" value="${app.tcpSlaveAgentListener.port}"/>
+    </j:if>
+    <j:forEach var="pd" items="${h.pageDecorators}">
+      <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
+    </j:forEach>
+  </j:if>
+  <html>
   <head>
     ${h.checkPermission(it,permission)}
 
