diff --git a/Library/Homebrew/commands.rb b/Library/Homebrew/commands.rb
new file mode 100644
index 0000000000..caf356b438
--- /dev/null
+++ b/Library/Homebrew/commands.rb
@@ -0,0 +1,13 @@
+module Commands
+  def self.path(cmd)
+    if File.exist?(HOMEBREW_LIBRARY_PATH/"cmd/#{cmd}.sh")
+      HOMEBREW_LIBRARY_PATH/"cmd/#{cmd}.sh"
+    elsif File.exist?(HOMEBREW_LIBRARY_PATH/"dev-cmd/#{cmd}.sh")
+      HOMEBREW_LIBRARY_PATH/"dev-cmd/#{cmd}.sh"
+    elsif File.exist?(HOMEBREW_LIBRARY_PATH/"cmd/#{cmd}.rb")
+      HOMEBREW_LIBRARY_PATH/"cmd/#{cmd}.rb"
+    elsif File.exist?(HOMEBREW_LIBRARY_PATH/"dev-cmd/#{cmd}.rb")
+      HOMEBREW_LIBRARY_PATH/"dev-cmd/#{cmd}.rb"
+    end
+  end
+end
diff --git a/Library/Homebrew/test/test_commands.rb b/Library/Homebrew/test/test_commands.rb
index 88e35f416f..c51e815590 100644
--- a/Library/Homebrew/test/test_commands.rb
+++ b/Library/Homebrew/test/test_commands.rb
@@ -63,16 +63,16 @@ class CommandsTests < Homebrew::TestCase
 
   def test_internal_command_path
     assert_equal HOMEBREW_LIBRARY_PATH/"cmd/rbcmd.rb",
-                 Homebrew.send(:internal_command_path, "rbcmd")
+                 Commands.path("rbcmd")
     assert_equal HOMEBREW_LIBRARY_PATH/"cmd/shcmd.sh",
-                 Homebrew.send(:internal_command_path, "shcmd")
-    assert_nil Homebrew.send(:internal_command_path, "idontexist1234")
+                 Commands.path("shcmd")
+    assert_nil Commands.path("idontexist1234")
   end
 
   def test_internal_dev_command_path
     assert_equal HOMEBREW_LIBRARY_PATH/"dev-cmd/rbdevcmd.rb",
-                 Homebrew.send(:internal_command_path, "rbdevcmd")
+                 Commands.path("rbdevcmd")
     assert_equal HOMEBREW_LIBRARY_PATH/"dev-cmd/shdevcmd.sh",
-                 Homebrew.send(:internal_command_path, "shdevcmd")
+                 Commands.path("shdevcmd")
   end
 end