diff --git a/ChangeLog b/ChangeLog
index 250679218217158fc329d36e5cf5bbf96c5a5450..5184e20cd4efb7aac3c6f3366b48d854a4639713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,10 +60,8 @@ CVS code -
 	- Simplify so as not to require the fileptr parameter anymore,
 	  since it's set to current in all calls. (DLR)
 	- Add comments better explaining what the update actually does,
-	  avoid an infinite loop when location is NONE and current_y is
-	  greater than (editwinrows - 1), and make sure that the bottom
-	  line of the file is at the bottom line of the screen if it's
-	  onscreen and location is NONE. (DLR)
+	  and avoid an infinite loop when location is NONE and current_y
+	  is greater than (editwinrows - 1). (DLR)
   do_yesno()
 	- Don't bother assigning the value of get_mouseinput() to
 	  anything.  Since allow_shortcuts is FALSE, its return value
diff --git a/src/winio.c b/src/winio.c
index ada4a4b6360efac8e6ab009cc5c83ea8b5d33100..a6ec5ad79719b8d41db1c89bab62e929c131788c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2955,12 +2955,6 @@ void edit_update(topmidnone location)
 	    /* Limit goal to (editwinrows - 1) lines maximum. */
 	    if (goal > editwinrows - 1)
 		goal = editwinrows - 1;
-
-	    /* If the last line of the file is onscreen but isn't at the
-	     * bottom of the screen, set goal so that it will be after
-	     * we update. */
-	    if (foo->lineno + editwinrows >= filebot->lineno)
-		goal = (editwinrows - 1) - (filebot->lineno - foo->lineno);
 	}
 
 	for (; goal > 0 && foo->prev != NULL; goal--)