diff -P -r -u -F '^function' views_old/views_cache.inc views/views_cache.inc
--- views_old/views_cache.inc	2007-07-14 21:12:02.000000000 +0200
+++ views/views_cache.inc	2007-09-23 15:00:13.000000000 +0200
@@ -276,14 +276,9 @@ function _views_get_query(&$view, $args,
   else {
     views_load_query();
     $info = _views_build_query($view, $args, $filters);
-    $data = array(
-        'query' => _views_replace_args($info['query'], $info['args']),
-        'countquery' => _views_replace_args($info['countquery'], $info['args']),
-    );
     if ($view->is_cacheable) {
-      cache_set('views_query:' . $view->name, 'cache_views', serialize($data));
+      cache_set('views_query:' . $view->name, 'cache_views', serialize($info));
     }
-    $info = array_merge($info, $data);
   }
 
   // Run-time replacement so we can do cacheing
@@ -332,4 +327,4 @@ function _views_get_style_plugins($title
     }
   }
   return ($titles ? $views_style_plugins['title'] : $views_style_plugins['base']);
-}
\ No newline at end of file
+}
diff -P -r -u -F '^function' views_old/views_query.inc views/views_query.inc
--- views_old/views_query.inc	2007-04-12 17:18:58.000000000 +0200
+++ views/views_query.inc	2007-09-23 14:58:43.000000000 +0200
@@ -659,16 +659,3 @@ function _views_build_summary(&$query, $
     return $query;
   }
 }
-
-/*
- * Support db_query() style argument replacement in a clause.
- */
-
-function _views_replace_args($clause, $args) {
-  // cut & pasted directly from db_query.
-  if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
-    $args = $args[0];
-  }
-  _db_query_callback($args, TRUE);
-  return preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $clause);
-}