diff --git a/src/Input.js b/src/Input.js
index fa516a4ee4..f385c5607d 100644
--- a/src/Input.js
+++ b/src/Input.js
@@ -1,15 +1,11 @@
 import React from 'react';
 import InputBase from './InputBase';
-import ButtonInput from './ButtonInput';
 import FormControls from './FormControls';
 import deprecationWarning from './utils/deprecationWarning';
 
 class Input extends InputBase {
   render() {
-    if (ButtonInput.types.indexOf(this.props.type) > -1) {
-      deprecationWarning(`Input type=${this.props.type}`, 'ButtonInput');
-      return <ButtonInput {...this.props} />;
-    } else if (this.props.type === 'static') {
+    if (this.props.type === 'static') {
       deprecationWarning('Input type=static', 'StaticText');
       return <FormControls.Static {...this.props} />;
     }
diff --git a/test/InputSpec.js b/test/InputSpec.js
index 3a73cba5cf..54bb2b3c51 100644
--- a/test/InputSpec.js
+++ b/test/InputSpec.js
@@ -41,30 +41,6 @@ describe('Input', function () {
     assert.equal(instance.getValue(), 'v');
   });
 
-  it('throws a deprecation warning on type=button', function () {
-    ReactTestUtils.renderIntoDocument(
-      <Input type="button" />
-    );
-
-    shouldWarn('deprecated');
-  });
-
-  it('throws a deprecation warning on type=reset', function () {
-    ReactTestUtils.renderIntoDocument(
-      <Input type="reset" />
-    );
-
-    shouldWarn('deprecated');
-  });
-
-  it('throws a deprecation warning on type=submit', function () {
-    ReactTestUtils.renderIntoDocument(
-      <Input type="submit" />
-    );
-
-    shouldWarn('deprecated');
-  });
-
   it('throws a warning when type=static', function () {
     ReactTestUtils.renderIntoDocument(
       <Input type="static" value="v" />