diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index 0c100ac67a..bf2c9c2944 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -26,7 +26,6 @@ class customfields_widget
 {
 	var $public_functions = array(
 		'pre_process' => True,
-		'post_process' => True,
 	);
 	var $human_name = array(
 		'customfields' => 'custom fields',
@@ -113,17 +112,13 @@ class customfields_widget
 	function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,etemplate $tmpl)
 	{
 		list($app) = explode('.',$tmpl->name);
-		if($extension_data['app']) $app = $extension_data['app'];
-		// if we are in the etemplate editor or the app has no cf's, load the cf's from the app the tpl belongs too
-		if ($app && $app != 'stylite' && $app != $this->appname && (
-			$this->appname == 'etemplate' || !$this->customfields || etemplate::$hooked || $extension_data['app']
-		))
+
+		// if we are in the etemplate editor or a different app, load the cf's from the app the tpl belongs to
+		if ($app && $app != 'stylite' && $app != $this->appname)
 		{
 			self::__construct(null,$app); 	// app changed
-
-			// Need to keep hooked app for things like nm filter changes and validation errors
-			if(etemplate::$hooked) $extension_data['app'] = $app;
 		}
+
 		list($type2,$use_private,$field_names) = explode(',',$cell['size'],3);
 		$fields_with_vals=array();
 
@@ -500,14 +495,6 @@ class customfields_widget
 		return True;	// extra Label is ok
 	}
 
-	/**
-	 * Override to pass along extension_data - doesn't happen otherwise
-	 */
-	public function post_process($name,&$value,&$extension_data,&$loop,etemplate &$tmpl,$value_in) {
-		$value = $value_in;
-		return true;
-	}
-
 	/**
 	 * Read the options of a 'select' or 'radio' custom field from a file
 	 *