diff --git a/Library/Homebrew/cask/lib/hbc.rb b/Library/Homebrew/cask/lib/hbc.rb
index 7547ea1e23..916a7ef349 100644
--- a/Library/Homebrew/cask/lib/hbc.rb
+++ b/Library/Homebrew/cask/lib/hbc.rb
@@ -19,7 +19,6 @@ require "hbc/locations"
 require "hbc/config"
 require "hbc/macos"
 require "hbc/pkg"
-require "hbc/qualified_token"
 require "hbc/scopes"
 require "hbc/staged"
 require "hbc/system_command"
diff --git a/Library/Homebrew/cask/lib/hbc/cli/info.rb b/Library/Homebrew/cask/lib/hbc/cli/info.rb
index f12fe55648..991f0534ae 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/info.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/info.rb
@@ -60,16 +60,12 @@ module Hbc
       end
 
       def self.repo_info(cask)
-        user, repo, token = QualifiedToken.parse(Hbc.all_tokens.detect { |t| t.split("/").last == cask.token })
+        return if cask.tap.nil?
 
-        return if user.nil? || repo.nil?
-
-        remote_tap = Tap.fetch(user, repo)
-
-        url = if remote_tap.custom_remote? && !remote_tap.remote.nil?
-          remote_tap.remote
+        url = if cask.tap.custom_remote? && !cask.tap.remote.nil?
+          cask.tap.remote
         else
-          "#{remote_tap.default_remote}/blob/master/Casks/#{token}.rb"
+          "#{cask.tap.default_remote}/blob/master/Casks/#{cask.token}.rb"
         end
 
         puts "From: #{Formatter.url(url)}"
diff --git a/Library/Homebrew/cask/lib/hbc/qualified_token.rb b/Library/Homebrew/cask/lib/hbc/qualified_token.rb
deleted file mode 100644
index 09eedef1b3..0000000000
--- a/Library/Homebrew/cask/lib/hbc/qualified_token.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Hbc
-  module QualifiedToken
-    def self.parse(arg)
-      return nil unless arg.is_a?(String)
-      return nil unless match = arg.downcase.match(HOMEBREW_TAP_CASK_REGEX)
-      user, repo, token = match.captures
-      odebug "[user, repo, token] might be [#{user}, #{repo}, #{token}]"
-      [user, repo, token]
-    end
-  end
-end