diff --git a/direct/src/showbase/GravityWalker.py b/direct/src/showbase/GravityWalker.py
index 20a61dcf07..323d7aa77c 100755
--- a/direct/src/showbase/GravityWalker.py
+++ b/direct/src/showbase/GravityWalker.py
@@ -314,7 +314,6 @@ class GravityWalker(DirectObject.DirectObject):
         turnRight = inputState.isSet("turnRight")
         slide = 0 #hack -- was: inputState.isSet("slide")
         jump = inputState.isSet("jump")
-        pie = inputState.isSet("pie")
         # Determine what the speeds are based on the buttons:
         self.speed=(forward and self.avatarControlForwardSpeed or 
                     reverse and -self.avatarControlReverseSpeed)
@@ -326,13 +325,6 @@ class GravityWalker(DirectObject.DirectObject):
                 (turnLeft and self.avatarControlRotateSpeed) or
                 (turnRight and -self.avatarControlRotateSpeed))
 
-        # No moving allowed while throwing a pie.
-        if pie:
-            self.speed = 0
-            self.slideSpeed = 0
-            self.rotationSpeed = 0
-            jump = 0
-
         if self.wantDebugIndicator:
             onScreenDebug.add("airborneHeight", self.lifter.getAirborneHeight()) #*#
             onScreenDebug.add("falling", self.falling) #*#
diff --git a/direct/src/showbase/InputState.py b/direct/src/showbase/InputState.py
index dace053e8f..479b8b9c5b 100755
--- a/direct/src/showbase/InputState.py
+++ b/direct/src/showbase/InputState.py
@@ -73,6 +73,9 @@ class InputState(DirectObject.DirectObject):
     def set(self, name, isSet):
         assert(self.debugPrint("set(name=%s, isSet=%s)"%(name, isSet)))
         self.state[name] = isSet
+        # We change the name befor sending it because this may
+        # be the same name that messenger used to call InputState.set()
+        # this avoids running in circles:
         messenger.send("InputState-%s"%(name,), [isSet])
     
     def isSet(self, name):