Revert "Let org-agenda-time-grid control if the grid is displayed"

This reverts commit 993dd076fbe1dc62f2297a24a3f6acd8890e1af0.

lisp/org-agenda.el

@@ -3886,11 +3886,10 @@ given in `org-agenda-start-on-weekday'."
 	    (put-text-property s (1- (point)) 'org-day-cnt day-cnt)
 	    (when todayp
 	      (put-text-property s (1- (point)) 'org-today t))
-	    (setq rtnall
-		  (append rtnall
-			  (org-agenda-add-time-grid-maybe rtnall ndays todayp)))
 	    (if rtnall (insert ;; all entries
-			(org-finalize-agenda-entries rtnall)
+			(org-finalize-agenda-entries
+			 (org-agenda-add-time-grid-maybe
+			  rtnall ndays todayp))
 			"\n"))
 	    (put-text-property s (1- (point)) 'day d)
 	    (put-text-property s (1- (point)) 'org-day-cnt day-cnt))))