diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java
index 9c5a86ee8c848..b3c92c0296197 100644
--- a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java
+++ b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java
@@ -148,13 +148,6 @@ public void click() {
       // element not visible either
     }
 
-    if (element instanceof HtmlButton) {
-      String type = element.getAttribute("type");
-      if (type == DomElement.ATTRIBUTE_NOT_DEFINED || type == DomElement.ATTRIBUTE_VALUE_EMPTY) {
-        element.setAttribute("type", "submit");
-      }
-    }
-
     HtmlUnitMouse mouse = (HtmlUnitMouse) parent.getMouse();
     mouse.click(getCoordinates());
 
@@ -209,7 +202,7 @@ private void submitForm(HtmlForm form) {
         continue;
       }
 
-      if (isBefore(submit)) {
+      if (submit == null) {
         submit = element;
       }
     }
@@ -248,10 +241,6 @@ private boolean isSubmitElement(HtmlElement element) {
     return candidate != null;
   }
 
-  private boolean isBefore(HtmlElement submit) {
-    return submit == null;
-  }
-
   @Override
   public void clear() {
     assertElementNotStale();