diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index a63f85ba511..eb43da06e19 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.10.2.1 2005/11/22 18:23:11 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.10.2.2 2006/04/28 20:57:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -117,15 +117,6 @@ optimize_minmax_aggregates(PlannerInfo *root, List *tlist, Path *best_path)
 		return NULL;
 	rel = find_base_rel(root, rtr->rtindex);
 
-	/*
-	 * Also reject cases with subplans or volatile functions in WHERE. This
-	 * may be overly paranoid, but it's not entirely clear if the
-	 * transformation is safe then.
-	 */
-	if (contain_subplans(parse->jointree->quals) ||
-		contain_volatile_functions(parse->jointree->quals))
-		return NULL;
-
 	/*
 	 * Since this optimization is not applicable all that often, we want to
 	 * fall out before doing very much work if possible.  Therefore we do the
@@ -508,7 +499,7 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *info, List *constant_quals)
 	ntest->nulltesttype = IS_NOT_NULL;
 	ntest->arg = copyObject(info->target);
 
-	plan->qual = lappend(plan->qual, ntest);
+	plan->qual = lcons(ntest, plan->qual);
 
 	if (constant_quals)
 		plan = (Plan *) make_result(copyObject(plan->targetlist),
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index e621e710f5b..60071ca9cc3 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.100.2.1 2005/11/22 18:23:11 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.100.2.2 2006/04/28 20:57:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1230,8 +1230,6 @@ SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 	List	   *saved_initplan = PlannerInitPlan;
 	SubPlan    *node;
 	Param	   *prm;
-	Bitmapset  *tmpset;
-	int			paramid;
 
 	/*
 	 * Set up for a new level of subquery.	This is just to keep
@@ -1262,18 +1260,9 @@ SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 	PlannerInitPlan = lappend(PlannerInitPlan, node);
 
 	/*
-	 * Make parParam list of params that current query level will pass to this
-	 * child plan.	(In current usage there probably aren't any.)
+	 * The node can't have any inputs (since it's an initplan), so the
+	 * parParam and args lists remain empty.
 	 */
-	tmpset = bms_copy(plan->extParam);
-	while ((paramid = bms_first_member(tmpset)) >= 0)
-	{
-		PlannerParamItem *pitem = list_nth(PlannerParamList, paramid);
-
-		if (pitem->abslevel == PlannerQueryLevel)
-			node->parParam = lappend_int(node->parParam, paramid);
-	}
-	bms_free(tmpset);
 
 	/*
 	 * Make a Param that will be the subplan's output.