diff --git a/core/src/main/resources/lib/form/hetero-radio.jelly b/core/src/main/resources/lib/form/hetero-radio.jelly
index 17469b2a2a2a..075757f47084 100644
--- a/core/src/main/resources/lib/form/hetero-radio.jelly
+++ b/core/src/main/resources/lib/form/hetero-radio.jelly
@@ -47,8 +47,8 @@ THE SOFTWARE.
         <j:set var="descriptor" value="${d}" />
         <j:set var="instance" value="${currentDescriptor==d?currentInstance:null}" />
         <st:include from="${d}" page="${d.configPage}" optional="true" />
+        <f:class-entry descriptor="${d}" />
       </f:radioBlock>
-      <f:class-entry descriptor="${d}" />
     </j:forEach>
   </div>
   <!-- TODO consider customizedFields -->
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index d2abdee683f2..c6823375030a 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -37,19 +37,15 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <div class="rowSet-container jenkins-form-item">
-    <j:choose>
-      <j:when test="${attrs.ref==null and attrs.name==null}">
-        <!-- noop -->
-        <d:invokeBody />
-      </j:when>
-      <j:otherwise>
-        <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${attrs.name}"></div>
-        <div class="form-container tr">
-          <d:invokeBody />
-        </div>
-        <div class="row-set-end row-group-end tr"></div>
-      </j:otherwise>
-    </j:choose>
-  </div>
+  <j:choose>
+    <j:when test="${attrs.ref==null and attrs.name==null}">
+      <!-- noop -->
+      <d:invokeBody />
+    </j:when>
+    <j:otherwise>
+      <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${attrs.name}"></div>
+      <d:invokeBody />
+      <div class="row-set-end row-group-end tr"></div>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>