diff --git a/share/functions/type.fish b/share/functions/type.fish
index 6952c86c3..25ba5953e 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -101,11 +101,7 @@ function type --description 'Print the type of a command'
         if test $multi != yes
             set paths (command -s -- $i)
         else
-            # TODO: This should really be `command -sa`.
-            for file in $PATH/$i
-                test -x $file -a ! -d $file
-                and set paths $paths $file
-            end
+            set paths (command -sa -- $i)
         end
         for path in $paths
             set res 0