diff --git a/nodequeue.module b/nodequeue.module
index 312e02d..7977ddb 100644
--- a/nodequeue.module
+++ b/nodequeue.module
@@ -1808,19 +1808,16 @@ function nodequeue_api_autocomplete($queue, $subqueue, $string) {
     $query->where('LOWER(n.title) LIKE LOWER(:string)', array(':string' => '%' . db_like($string) . '%'));
   }
 
-  // Call to the API.
-  $function = $queue->owner . "_nodequeue_autocomplete";
-  if (function_exists($function)) {
-    return $function($queue, $subqueue, $string, $where, $where_args);
-  }
-  else {
-    $query->addTag('i18n_select');
-    $result = $query->execute();
+  $query->addMetaData('queue', $queue);
+  $query->addMetaData('subqueue', $subqueue);
+  $query->addTag('nodequeue_api_autocomplete');
 
-    foreach ($result as $node) {
-      $id = nodequeue_get_content_id($queue, $node);
-      $matches[$node->nid] = check_plain($node->title) . " [nid: $id]";
-    }
+  $query->addTag('i18n_select');
+  $result = $query->execute();
+
+  foreach ($result as $node) {
+    $id = nodequeue_get_content_id($queue, $node);
+    $matches[$node->nid] = check_plain($node->title) . " [nid: $id]";
   }
 
   return $matches;