diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 25550839bb..501076704c 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -173,7 +173,7 @@ case "$@" in
     homebrew-list "$@" && exit 0
     ;;
   # falls back to cmd/tap.rb on a non-zero return
-  tap*)
+  tap)
     source "${HOMEBREW_LIBRARY}/Homebrew/tap.sh"
     homebrew-tap "$@" && exit 0
     ;;
diff --git a/Library/Homebrew/tap.sh b/Library/Homebrew/tap.sh
index 483db17a0e..ef4d57b78c 100644
--- a/Library/Homebrew/tap.sh
+++ b/Library/Homebrew/tap.sh
@@ -14,19 +14,6 @@ normalise_tap_name() {
 }
 
 homebrew-tap() {
-  case "$1" in
-    # check we actually have tap and not e.g. tapsomething
-    tap) ;;
-    tap*) return 1 ;;
-    *) ;;
-  esac
-
-  # Named args are handled by the Ruby code.
-  if [[ "$#" -gt 1 ]]
-  then
-    return 1
-  fi
-
   local taplib="${HOMEBREW_LIBRARY}/Taps"
   (
     shopt -s extglob