--- flag.module.orig	2010-07-15 01:34:46.000000000 +0200
+++ flag.module	2010-08-04 12:26:39.234375000 +0200
@@ -717,17 +717,11 @@ function flag_flag($action, $flag, $cont
     $context = array_merge($flag->get_relevant_action_objects($content_id), $context);
 
     // Generic "all flags" actions.
-    foreach (_trigger_get_hook_aids($action, $action) as $aid => $action_info) {
+    foreach (_trigger_get_hook_aids('flag', $action) as $aid => $action_info) {
       // The 'if ($aid)' is a safeguard against http://drupal.org/node/271460#comment-886564
       if ($aid) {
         actions_do($aid, $flag, $context);
       }
-    }
-    // Actions specifically for this flag.
-    foreach (_trigger_get_hook_aids($action . '_' . $flag->name, $action) as $aid => $action_info) {
-      if ($aid) {
-        actions_do($aid, $flag, $context);
-      }
     }
   }