diff --git a/emailpanels/plugins/tasks/contactemail.inc b/emailpanels/plugins/tasks/contactemail.inc
index 388517b..4a9accb 100755
--- a/emailpanels/plugins/tasks/contactemail.inc
+++ b/emailpanels/plugins/tasks/contactemail.inc
@@ -78,10 +78,8 @@ function emailpanels_contactemail($nid, $field_name) {
 
   // @todo add ability to accept the node and field name context; well maybe just the node context
 
-  // is it worth the performance hit to include node as a context? if so switch
-  //$contexts = emailpanels_contactemail_get_contexts($task, '', array($nid));
-  $contexts = emailpanels_contactemail_get_contexts($task, '', array());
-
+  // Load the node into a context.
+  $contexts = ctools_context_handler_get_task_contexts($task, '', array($nid));
   $output = ctools_context_handler_render($task, '', $contexts, array('nid' => $nid, 'field_name' => $field_name));
   if ($output !== FALSE) {
     return $output;