diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index e6a406911..62a28e945 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -2345,8 +2345,7 @@ _clutter_actor_rerealize (ClutterActor    *self,
 }
 
 static void
-clutter_actor_real_pick (ClutterActor       *self,
-			 const ClutterColor *color)
+clutter_actor_real_pick (ClutterActor *self)
 {
   if (clutter_actor_should_pick_paint (self))
     {
@@ -4163,22 +4162,15 @@ clutter_actor_continue_paint (ClutterActor *self)
         }
       else
         {
-          ClutterColor col = { 0, };
-
           /* The actor will log a silhouette of itself to the stage pick log.
-           * Note that the picking color is no longer used as the "log" instead
-           * keeps a weak pointer to the actor itself. But we keep the color
-           * parameter for now so as to maintain ABI compatibility. The color
-           * parameter can be removed when someone feels like breaking the ABI
-           * along with gnome-shell.
            *
            * XXX:2.0 - Call the pick() virtual directly
            */
           if (g_signal_has_handler_pending (self, actor_signals[PICK],
                                             0, TRUE))
-            g_signal_emit (self, actor_signals[PICK], 0, &col);
+            g_signal_emit (self, actor_signals[PICK], 0);
           else
-            CLUTTER_ACTOR_GET_CLASS (self)->pick (self, &col);
+            CLUTTER_ACTOR_GET_CLASS (self)->pick (self);
         }
     }
   else
@@ -8537,12 +8529,10 @@ clutter_actor_class_init (ClutterActorClass *klass)
   /**
    * ClutterActor::pick:
    * @actor: the #ClutterActor that received the signal
-   * @color: the #ClutterColor to be used when picking
    *
    * The ::pick signal is emitted each time an actor is being painted
    * in "pick mode". The pick mode is used to identify the actor during
    * the event handling phase, or by clutter_stage_get_actor_at_pos().
-   * The actor should paint its shape using the passed @pick_color.
    *
    * Subclasses of #ClutterActor should override the class signal handler
    * and paint themselves in that function.
@@ -8560,8 +8550,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
                   G_STRUCT_OFFSET (ClutterActorClass, pick),
                   NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_COLOR | G_SIGNAL_TYPE_STATIC_SCOPE);
+                  G_TYPE_NONE, 0);
 
   /**
    * ClutterActor::allocation-changed:
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index dd09546ec..d7382c776 100644
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -233,8 +233,7 @@ struct _ClutterActorClass
                                  ClutterActor          *old_parent);
 
   void (* destroy)              (ClutterActor          *self);
-  void (* pick)                 (ClutterActor          *actor,
-                                 const ClutterColor    *color);
+  void (* pick)                 (ClutterActor          *actor);
 
   gboolean (* queue_redraw)     (ClutterActor          *actor,
                                  ClutterActor          *leaf_that_queued,
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 9435d0b14..4b051afc3 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1000,8 +1000,7 @@ clutter_stage_paint (ClutterActor *self)
 }
 
 static void
-clutter_stage_pick (ClutterActor       *self,
-		    const ClutterColor *color)
+clutter_stage_pick (ClutterActor *self)
 {
   ClutterActorIter iter;
   ClutterActor *child;
diff --git a/clutter/clutter/deprecated/clutter-group.c b/clutter/clutter/deprecated/clutter-group.c
index cc56c3bda..f4c471356 100644
--- a/clutter/clutter/deprecated/clutter-group.c
+++ b/clutter/clutter/deprecated/clutter-group.c
@@ -291,13 +291,12 @@ clutter_group_real_paint (ClutterActor *actor)
 }
 
 static void
-clutter_group_real_pick (ClutterActor       *actor,
-                         const ClutterColor *pick)
+clutter_group_real_pick (ClutterActor *actor)
 {
   ClutterGroupPrivate *priv = CLUTTER_GROUP (actor)->priv;
 
   /* Chain up so we get a bounding box pained (if we are reactive) */
-  CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor, pick);
+  CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor);
 
   g_list_foreach (priv->children, (GFunc) clutter_actor_paint, NULL);
 }
diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 5227bfd9a..19e775dc9 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -129,8 +129,7 @@ meta_surface_actor_paint (ClutterActor *actor)
 }
 
 static void
-meta_surface_actor_pick (ClutterActor       *actor,
-                         const ClutterColor *color)
+meta_surface_actor_pick (ClutterActor *actor)
 {
   MetaSurfaceActor *self = META_SURFACE_ACTOR (actor);
   MetaSurfaceActorPrivate *priv =
@@ -143,7 +142,7 @@ meta_surface_actor_pick (ClutterActor       *actor,
 
   /* If there is no region then use the regular pick */
   if (priv->input_region == NULL)
-    CLUTTER_ACTOR_CLASS (meta_surface_actor_parent_class)->pick (actor, color);
+    CLUTTER_ACTOR_CLASS (meta_surface_actor_parent_class)->pick (actor);
   else
     {
       int n_rects;