diff --git sites/all/modules/workflow/workflow/workflow.module sites/all/modules/workflow/workflow/workflow.module
index 39ca696..3d48e50 100644
--- sites/all/modules/workflow/workflow/workflow.module
+++ sites/all/modules/workflow/workflow/workflow.module
@@ -233,12 +233,6 @@ function workflow_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
         $sid = $node->workflow;
       }
 
-      // Unglobal the sid
-      $result = db_query("SELECT sid FROM {workflow_states} WHERE wid = %d AND gsid = %d", $wid, $sid);
-      if($data = db_fetch_object($result)) {
-        $sid = $data->sid;
-      }
-
       workflow_transition($node, $sid);
       break;
 
@@ -503,14 +497,6 @@ function workflow_form_alter(&$form, $form_state, $form_id) {
 function workflow_execute_transition($node, $sid, $comment = NULL, $force = FALSE) {
   global $user;
   $old_sid = workflow_node_current_state($node);
-
-  // Unglobal the sid
-  $wid = workflow_get_workflow_for_type($node->type);
-  $result = db_query("SELECT sid FROM {workflow_states} WHERE wid = %d AND gsid = %d", $wid, $sid);
-  if ($data = db_fetch_object($result)) {
-    $sid = $data->sid;
-  }
-
   if ($old_sid == $sid) {
     // Stop if not going to a different state.
     // Write comment into history though.