diff --git a/share/completions/set.fish b/share/completions/set.fish
index 87f59547d..f52209f03 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -2,12 +2,6 @@
 # Completions for the 'set' builtin
 #
 
-#
-# All locale variables used by set completions
-#
-
-set -l __fish_locale_vars LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
 #
 # Various helper functions
 #
@@ -36,7 +30,7 @@ function __fish_set_is_locale -d 'Test if We are specifying a locale value for t
     for i in $cmd
         switch $i
 
-            case $__fish_locale_vars
+            case LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
                 return 0
 
             case '-*'