Revert "Cleanup and bug fixes for merge."

This reverts commit 4ba86d1.

src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js

@@ -163,25 +163,25 @@ describe('ReactDOMTextarea', function() {
   it('should take updates to `defaultValue` for uncontrolled textarea', function() {
     var container = document.createElement('div');
 
-    var node = ReactDOM.render(<textarea defaultValue="0" />, container);
+    var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
 
     expect(node.value).toBe('0');
 
-    ReactDOM.render(<textarea defaultValue="1" />, container);
+    ReactDOM.render(<textarea type="text" defaultValue="1" />, container);
 
     expect(node.value).toBe('1');
   });
 
   it('should take updates to children in lieu of `defaultValue` for uncontrolled textarea', function() {
     var container = document.createElement('div');
 
-    var node = ReactDOM.render(<textarea defaultValue="0" />, container);
+    var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
 
     expect(node.value).toBe('0');
 
     spyOn(console, 'error'); // deprecation warning for `children` content
 
-    ReactDOM.render(<textarea>1</textarea>, container);
+    ReactDOM.render(<textarea type="text">1</textarea>, container);
 
     expect(node.value).toBe('1');
   });