Index: devel.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel.module,v
retrieving revision 1.429
diff -u -r1.429 devel.module
--- devel.module	13 Aug 2010 17:48:31 -0000	1.429
+++ devel.module	13 Aug 2010 20:27:33 -0000
@@ -1094,21 +1094,11 @@
  *
  * @param $name The username to switch to.
  */
-function devel_switch_user($name = NULL) {
+function devel_switch_user($name) {
   global $user;
-  static $orig_user = array();
 
-  if (isset($name)) {
-    $user = user_load_by_name($name);
-  }
-  // Retrieve the initial user. Can be called multiple times.
-  elseif (count($orig_user)) {
-    $user = array_shift($orig_user);
-    array_unshift($orig_user, $user);
-  }
-  // Store the initial user.
-  else {
-    $orig_user[] = $user;
+  if (isset($name) && $user = user_load_by_name($name)) {
+    drupal_session_regenerate();
   }
   drupal_goto();
 }