diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62a8a449d71..0bb5aebcd8f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-24  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (proceed): No longer handle negative step.
+
 2015-03-24  Gary Benson  <gbenson@redhat.com>
 
 	* nat/x86-linux.h (x86_linux_new_thread): New declaration.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 0f8f531a584..ed4ba79787c 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2588,10 +2588,8 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal, int step)
   pc = regcache_read_pc (regcache);
   tp = inferior_thread ();
 
-  if (step > 0)
+  if (step)
     step_start_function = find_pc_function (pc);
-  if (step < 0)
-    stop_after_trap = 1;
 
   /* Fill in with reasonable starting values.  */
   init_thread_stepping_state (tp);