Merge branch 'maint'

lisp/org.el

@@ -11558,8 +11558,7 @@ on the system \"/user@host:\"."
 					(regexp-quote heading)))
 			    (target
 			     (org-link-display-format
-			      (if (not org-refile-use-outline-path)
-				  (org-match-string-no-properties 4)
+			      (if (not org-refile-use-outline-path) heading
 				(mapconcat
 				 #'org-protect-slash
 				 (append