diff --git a/libs/ardour/ardour/control_group.h b/libs/ardour/ardour/control_group.h
index d0afc185e2..76f3292915 100644
--- a/libs/ardour/ardour/control_group.h
+++ b/libs/ardour/ardour/control_group.h
@@ -49,7 +49,7 @@ class LIBARDOUR_API ControlGroup : public std::enable_shared_from_this<ControlGr
 		Inverted = 0x2,
 	};
 
-	void fill_from_selection_or_group (std::shared_ptr<Stripable>, CoreSelection const &, Evoral::Parameter const &, bool (RouteGroup::*group_predicate)() const);
+	void fill_from_stripable_list (StripableList&, Evoral::Parameter const &);
 
 	int add_control (std::shared_ptr<AutomationControl>, bool push = false);
 	int remove_control (std::shared_ptr<AutomationControl>, bool pop = false);
diff --git a/libs/ardour/control_group.cc b/libs/ardour/control_group.cc
index 06e396b1c0..adbf01a816 100644
--- a/libs/ardour/control_group.cc
+++ b/libs/ardour/control_group.cc
@@ -218,12 +218,8 @@ ControlGroup::set_group_value (std::shared_ptr<AutomationControl> control, doubl
 }
 
 void
-ControlGroup::fill_from_selection_or_group (std::shared_ptr<Stripable> target, CoreSelection const & sel, Evoral::Parameter const & p, bool (RouteGroup::*group_predicate)() const)
+ControlGroup::fill_from_stripable_list (StripableList& sl, Evoral::Parameter const & p)
 {
-	StripableList sl;
-
-	sel.get_stripables_for_op (sl, target, group_predicate);
-
 	/* Very unfortunate that gain control is special cased. Routes do not
 	 * call ::add_control() for their gain control, but instead pass it to
 	 * their Amp processor which takes a certain kind of ownership of it.