diff --git a/share/functions/__fish_complete_command.fish b/share/functions/__fish_complete_command.fish
index 983366db6..35f5e29b5 100644
--- a/share/functions/__fish_complete_command.fish
+++ b/share/functions/__fish_complete_command.fish
@@ -2,11 +2,7 @@ function __fish_complete_command --description 'Complete using all available com
 	set -l ctoken (commandline -ct)
 	switch $ctoken
 	case '*=*'
-        # Some seds (e.g. on Mac OS X), don't support \n in the RHS
-        # Use a literal newline instead
-        # http://sed.sourceforge.net/sedfaq4.html#s4.1
-		set ctoken (echo $ctoken  | sed 's/=/\\
-/')
+		set ctoken (string split "=" -- $ctoken)
 		printf '%s\n' $ctoken[1]=(complete -C$ctoken[2])
 	case '*'
 		complete -C$ctoken