Revert "org.el (org-sort-remove-invisible): Truly returns the visible part of the string"

This reverts commit 30d6dc8baa699230f8d770a52485d10e59f84033.

lisp/org.el

@@ -8319,13 +8319,14 @@ Optional argument WITH-CASE means sort case-sensitively."
    (t
     (org-call-with-arg 'org-sort-entries with-case))))
 
-(defsubst org-sort-remove-invisible (s)
-  "Return the visible string from string S."
-  (let (result)
-    (dotimes (c (length s))
-      (let ((st (substring s c (1+ c))))
-	(unless (get-text-property 0 'invisible st) (push st result))))
-    (mapconcat 'identity (reverse result) "")))
+(defun org-sort-remove-invisible (s)
+  "Remove invisible links from string S."
+  (remove-text-properties 0 (length s) org-rm-props s)
+  (while (string-match org-bracket-link-regexp s)
+    (setq s (replace-match (if (match-end 2)
+			       (match-string 3 s)
+			     (match-string 1 s)) t t s)))
+  s)
 
 (defvar org-priority-regexp) ; defined later in the file