diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
index 616cdb594979..05c95c0f7ca5 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -55,9 +55,9 @@ THE SOFTWARE.
       <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigUnclassifiedReadable()}">
         <j:set var="readOnlyMode" value="${!editable.contains(descriptor)}" />
         <j:set var="instance" value="${descriptor}" /><!-- this makes the <f:textbox field=.../> work -->
-        <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${descriptor.jsonSafeClassName}"/>
-        <st:include page="${descriptor.globalConfigPage}" from="${descriptor}" />
-        <div class="row-set-end row-group-end tr"/>
+        <f:rowSet name="${descriptor.jsonSafeClassName}">
+          <st:include page="${descriptor.globalConfigPage}" from="${descriptor}" />
+        </f:rowSet>
       </j:forEach>
 
       <l:hasPermission permission="${app.SYSTEM_READ}">