diff --git a/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly b/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
index 67e5eb9e..018ec425 100644
--- a/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
+++ b/src/main/resources/hudson/plugins/s3/S3BucketPublisher/global.jelly
@@ -4,7 +4,7 @@
   <f:section title="Amazon S3 profiles">
     <f:entry title="S3 profiles" description="Profiles for publishing to S3 buckets">
       <f:repeatable var="profile" items="${descriptor.profiles}">
-        <s3:blockWrapper>
+        <div>
           <f:entry title="Profile name" help="/plugin/s3/help-profile.html">
             <f:textbox name="name" value="${profile.name}" />
           </f:entry>
@@ -48,7 +48,7 @@
             </div>
           </f:entry>
 
-        </s3:blockWrapper>
+        </div>
       </f:repeatable>
     </f:entry>
   </f:section>
diff --git a/src/main/resources/lib/s3Plugin/blockWrapper.jelly b/src/main/resources/lib/s3Plugin/blockWrapper.jelly
deleted file mode 100644
index 1077c59c..00000000
--- a/src/main/resources/lib/s3Plugin/blockWrapper.jelly
+++ /dev/null
@@ -1,16 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
-  <!-- TODO remove and switch to div after baseline is 2.264 or newer -->
-  <j:choose>
-    <j:when test="${divBasedFormLayout}">
-      <div>
-        <d:invokeBody/>
-      </div>
-    </j:when>
-    <j:otherwise>
-      <table width="100%" padding="0">
-        <d:invokeBody/>
-      </table>
-    </j:otherwise>
-  </j:choose>
-</j:jelly>