diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
index e6916164d9..59ee1b5093 100644
--- a/lib/msf/ui/console/command_dispatcher/core.rb
+++ b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -2453,7 +2453,9 @@ class Core
 	def cmd_grep_tabs(str, words)
 		# @todo, make sure this works, just guessed to start
 		tabs = @@grep_opts.fmt.keys || [] # default to use grep's options
-		tabs = driver.tab_complete(str, words) if (str and str =~ /\w/) # if not an opt, use normal tab comp.
+		# if not an opt, use normal tab comp.
+		# @todo uncomment out next line when tab_completion normalization is complete RM7649
+		# tabs = driver.get_all_commands if (str and str =~ /\w/) 
 		tabs
 	end