diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 4cdeeac5dc09c64886dabfd4ebb8ebb411a4611f..42410662ebbf543cddf358a736f9a937b86f9181 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -33,8 +33,10 @@ import hudson.model.listeners.SaveableListener;
 import hudson.node_monitors.NodeMonitor;
 import hudson.slaves.NodeDescriptor;
 import hudson.util.DescribableList;
+import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import jenkins.model.Jenkins;
+import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -315,7 +317,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
      * Accepts submission from the configuration page.
      */
     @RequirePOST
-    public synchronized void doConfigSubmit( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException, FormException {
+    public synchronized HttpResponse doConfigSubmit( StaplerRequest req) throws IOException, ServletException, FormException {
         BulkChange bc = new BulkChange(MONITORS_OWNER);
         try {
             Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
@@ -334,7 +336,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
                 nm.triggerUpdate();
             }
 
-            rsp.sendRedirect2(".");
+            return FormApply.success(".");
         } finally {
             bc.commit();
         }
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 55b7bb89335e48b5a372dd162a33ea830c764aad..1395f69c1cc8de86be021b25eddd2db395a14863 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -54,6 +54,7 @@ import hudson.tasks.BuildWrapper;
 import hudson.tasks.BuildStep;
 import hudson.tasks.test.AbstractTestResultAction;
 import hudson.util.FlushProofOutputStream;
+import hudson.util.FormApply;
 import hudson.util.IOException2;
 import hudson.util.LogTaskListener;
 import hudson.util.XStream2;
@@ -2052,7 +2053,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         } finally {
             bc.abort();
         }
-        return HttpResponses.redirectToDot();
+        return FormApply.success(".");
     }
 
     protected void submit(JSONObject json) throws IOException {
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index 93a05f79cefeff270ce70947246988e6b77a84fd..c8c376f0737b07594412d85bd4b2dd240b65ea98 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -33,6 +33,7 @@ import hudson.security.ACL;
 import hudson.security.AccessControlled;
 import hudson.security.Permission;
 import hudson.security.SecurityRealm;
+import hudson.util.FormApply;
 import hudson.util.RunList;
 import hudson.util.XStream2;
 import jenkins.model.Jenkins;
@@ -529,7 +530,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
 
         save();
 
-        rsp.sendRedirect(".");
+        FormApply.success(".").generateResponse(req,rsp,this);
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 16addcf31baf9369134880de91128df49167d0b7..f2484dcb3564bbfe5a7bf1505da926d41d992e6b 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -49,6 +49,7 @@ import hudson.util.AlternativeUiTextProvider;
 import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.DescribableList;
 import hudson.util.DescriptorList;
+import hudson.util.FormApply;
 import hudson.util.IOException2;
 import hudson.util.RunList;
 import hudson.util.XStream2;
@@ -902,7 +903,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
 
         save();
 
-        rsp.sendRedirect2("../"+name);
+        FormApply.success("../"+name).generateResponse(req,rsp,this);
     }
 
     /**
diff --git a/core/src/main/resources/hudson/model/Computer/configure.jelly b/core/src/main/resources/hudson/model/Computer/configure.jelly
index f4894e026ec42a33e527cce0076ada760438ca95..3eb00c43c3c50edada18b8f198dc92462c02ed8d 100644
--- a/core/src/main/resources/hudson/model/Computer/configure.jelly
+++ b/core/src/main/resources/hudson/model/Computer/configure.jelly
@@ -42,9 +42,9 @@ THE SOFTWARE.
         <!-- main body of the configuration -->
         <st:include it="${instance}" page="configure-entries.jelly" />
 
-        <f:block>
+        <f:bottomButtonBar>
           <f:submit value="${%Save}"/>
-        </f:block>
+        </f:bottomButtonBar>
       </f:form>
     </l:main-panel>
   </l:layout>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
index 8e0d836b0dccdf897960fcf59105c4592e5f3b19..900bd783dda821e80d12b7cbcb120783be893cfb 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
@@ -39,9 +39,10 @@ THE SOFTWARE.
                           descriptors="${it.nodeMonitorDescriptors}"
                           instances="${it.nonIgnoredMonitors}" />
 
-        <f:block>
-          <f:submit value="OK" />
-        </f:block>
+        <f:bottomButtonBar>
+          <f:submit value="${%OK}" />
+          <f:apply />
+        </f:bottomButtonBar>
       </f:form>
     </l:main-panel>
   </l:layout>
diff --git a/core/src/main/resources/hudson/model/Run/configure.jelly b/core/src/main/resources/hudson/model/Run/configure.jelly
index 52c9ff41426a11e152887fb30002e1817296bc9a..ea5ec82f65bd49bd033cb0e4de11ef52effac8ea 100644
--- a/core/src/main/resources/hudson/model/Run/configure.jelly
+++ b/core/src/main/resources/hudson/model/Run/configure.jelly
@@ -37,9 +37,10 @@ THE SOFTWARE.
         </f:entry>
 
         <j:if test="${h.hasPermission(it,it.UPDATE)}">
-          <f:block>
+          <f:bottomButtonBar>
             <f:submit value="${%Save}" />
-          </f:block>
+            <f:apply />
+          </f:bottomButtonBar>
         </j:if>
       </f:form>
     </l:main-panel>