Revert "Refactor refiling code"

This reverts commit 84e8434337ea86cd242bac6227232fa6e1f5fb6f.

lisp/org-agenda.el

@@ -6215,15 +6215,18 @@ If this information is not given, the function uses the tree at point."
     (let* ((marker (or (org-get-at-bol 'org-hd-marker)
 		       (org-agenda-error)))
 	   (buffer (marker-buffer marker))
-	   (pos (marker-position marker)))
+	   (pos (marker-position marker))
+	   (rfloc (or rfloc
+		      (org-refile-get-location
+		       (if goto "Goto: " "Refile to: ") buffer
+		       org-refile-allow-creating-parent-nodes))))
       (with-current-buffer buffer
 	(save-excursion
 	  (save-restriction
 	    (widen)
 	    (goto-char marker)
-	    (org-refile goto buffer rfloc)
-	    (with-current-buffer "*Org Agenda*"
-	      (org-agenda-redo))))))))
+	    (org-remove-subtree-entries-from-agenda)
+	    (org-refile goto buffer rfloc)))))))
 
 (defun org-agenda-open-link (&optional arg)
   "Follow the link in the current line, if any.