diff --git a/forms/CheckboxSetField.php b/forms/CheckboxSetField.php
index e72b1f516..55eb8cf2b 100644
--- a/forms/CheckboxSetField.php
+++ b/forms/CheckboxSetField.php
@@ -54,9 +54,7 @@ class CheckboxSetField extends OptionsetField {
 			'Options' => $this->getOptions()
 		));
 
-		return $this->customise($properties)->renderWith(
-			$this->getTemplates()
-		);
+		return FormField::Field($properties);
 	}
 
 	/**
diff --git a/forms/ListboxField.php b/forms/ListboxField.php
index 0989da05c..d8aac5b0f 100644
--- a/forms/ListboxField.php
+++ b/forms/ListboxField.php
@@ -102,7 +102,7 @@ class ListboxField extends DropdownField {
 			'Options' => new ArrayList($options)
 		));
 
-		return $this->customise($properties)->renderWith($this->getTemplates());
+		return FormField::Field($properties);
 	}
 
 	public function getAttributes() {
diff --git a/forms/OptionsetField.php b/forms/OptionsetField.php
index 42c1bab84..fb37c075b 100644
--- a/forms/OptionsetField.php
+++ b/forms/OptionsetField.php
@@ -83,9 +83,7 @@ class OptionsetField extends DropdownField {
 			'Options' => new ArrayList($options)
 		));
 
-		return $this->customise($properties)->renderWith(
-			$this->getTemplates()
-		);
+		return FormField::Field($properties);
 	}
 
 	/**
diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index cf3b7bf2a..78339661a 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -248,7 +248,7 @@ class TreeDropdownField extends FormField {
 			)
 		);
 
-		return $this->customise($properties)->renderWith('TreeDropdownField');
+		return parent::Field($properties);
 	}
 
 	public function extraClass() {
diff --git a/forms/TreeMultiselectField.php b/forms/TreeMultiselectField.php
index 5f0f7f302..1f3965f1a 100644
--- a/forms/TreeMultiselectField.php
+++ b/forms/TreeMultiselectField.php
@@ -135,7 +135,7 @@ class TreeMultiselectField extends TreeDropdownField {
 				'Value' => $value
 			)
 		);
-		return $this->customise($properties)->renderWith('TreeDropdownField');
+		return FormField::Field($properties);
 	}
 
 	/**
diff --git a/forms/UploadField.php b/forms/UploadField.php
index 57926dc77..9a9674b62 100644
--- a/forms/UploadField.php
+++ b/forms/UploadField.php
@@ -972,11 +972,11 @@ class UploadField extends FileField {
 		}
 
 		$mergedConfig = array_merge($config, $this->ufConfig);
-		return $this->customise(array(
+		return parent::Field(array(
 			'configString' => str_replace('"', """, Convert::raw2json($mergedConfig)),
 			'config' => new ArrayData($mergedConfig),
 			'multiple' => $allowedMaxFileNumber !== 1
-		))->renderWith($this->getTemplates());
+		));
 	}
 
 	/**