diff --git a/forms/DateField.php b/forms/DateField.php
index 5b0a91281..0557fba08 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -107,7 +107,7 @@ class DateField extends TextField {
 			}
 		}
 
-		parent::__construct($name, $title, $value, $form, $rightTitle);
+		parent::__construct($name, $title, $value);
 	}
 
 	function FieldHolder() {
diff --git a/forms/FormField.php b/forms/FormField.php
index ec18696ff..d512ceb63 100644
--- a/forms/FormField.php
+++ b/forms/FormField.php
@@ -106,7 +106,6 @@ class FormField extends RequestHandler {
 		$this->title = ($title === null) ? $name : $title;
 
 		if($value !== NULL) $this->setValue($value);
-		if($form) $this->setForm($form);
 
 		parent::__construct();
 	}
diff --git a/tests/forms/TextareaFieldTest.php b/tests/forms/TextareaFieldTest.php
index 92d68d901..5e1a421ba 100644
--- a/tests/forms/TextareaFieldTest.php
+++ b/tests/forms/TextareaFieldTest.php
@@ -7,7 +7,7 @@ class TextareaFieldTest extends SapphireTest {
 	 */
 	function testTextEncoding() {
 		$inputText = "This is my <text>These are some unicodes: äöü&<>";
-		$field = new TextareaField("Test", "Test", 5, 20);
+		$field = new TextareaField("Test", "Test");
 		$field->setValue($inputText);
 		$this->assertContains('This is my &lt;text&gt;These are some unicodes: &auml;&ouml;&uuml;&amp;&lt;&gt;', $field->Field());
 	}
@@ -17,7 +17,7 @@ class TextareaFieldTest extends SapphireTest {
 	 */
 	function testReadonlyTextEncoding() {
 		$inputText = "This is my <text>These are some unicodes: äöü&<>";
-		$field = new TextareaField("Test", "Test", 5, 20);
+		$field = new TextareaField("Test", "Test");
 		$field = $field->performReadonlyTransformation();
 		$field->setValue($inputText);
 		$this->assertContains('This is my &lt;text&gt;These are some unicodes: &auml;&ouml;&uuml;&amp;&lt;&gt;', $field->Field());