--- a/src/event-stream.c	Mon Oct 15 20:47:00 2012 +0200
+++ b/src/event-stream.c	Tue Nov 06 21:34:15 2012 +0000
@@ -4550,6 +4550,8 @@
 	    int magic_undo = 0;
 	    Elemcount magic_undo_count = 20;
 
+	    Vthis_command = leaf;
+
 	    /* Don't push an undo boundary if the command set the prefix arg,
 	       or if we are executing a keyboard macro, or if in the
 	       minibuffer.  If the command we are about to execute is
@@ -4565,8 +4567,6 @@
 	    if (SYMBOLP (leaf))
 	      {
 		Lisp_Object prop = Fget (leaf, Qself_insert_defer_undo, Qnil);
-                Lisp_Object remap = Qnil;
-
 		if (NATNUMP (prop))
                   {
                     magic_undo = 1;
@@ -4587,16 +4587,8 @@
 		  magic_undo = 1;
 		else if (EQ (leaf, Qself_insert_command))
 		  magic_undo = 1;
-
-                remap = command_remapping_for_event (leaf, event);
-                if (!NILP (remap))
-                  {
-                    leaf = remap;
-                  }
 	      }
 
-	    Vthis_command = leaf;
-
 	    if (!magic_undo)
 	      command_builder->self_insert_countdown = 0;
 	    if (NILP (XCONSOLE (console)->prefix_arg)