diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 87c7311e65..dcb1c0a939 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -333,10 +333,13 @@ module Homebrew
       f.bottle_specification.rebuild
     else
       ohai "Determining #{f.full_name} bottle rebuild..."
-      versions = FormulaVersions.new(f)
-      rebuilds = versions.bottle_version_map("origin/master")[f.pkg_version]
-      rebuilds.pop if rebuilds.last.to_i.positive?
-      rebuilds.empty? ? 0 : rebuilds.max.to_i + 1
+      FormulaVersions.new(f).formula_at_revision("origin/HEAD") do |upstream_f|
+        if f.pkg_version == upstream_f.pkg_version
+          upstream_f.bottle_specification.rebuild + 1
+        else
+          0
+        end
+      end
     end
 
     filename = Bottle::Filename.create(f, bottle_tag.to_sym, rebuild)
diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb
index 0701d643bd..281e9f8be0 100644
--- a/Library/Homebrew/formula_versions.rb
+++ b/Library/Homebrew/formula_versions.rb
@@ -30,7 +30,9 @@ class FormulaVersions
 
   def rev_list(branch)
     repository.cd do
-      Utils.popen_read("git", "rev-list", "--abbrev-commit", "--remove-empty", branch, "--", entry_name) do |io|
+      rev_list_cmd = ["git", "rev-list", "--abbrev-commit", "--remove-empty"]
+      rev_list_cmd << "--first-parent" if repository != CoreTap.instance.path
+      Utils.popen_read(*rev_list_cmd, branch, "--", entry_name) do |io|
         yield io.readline.chomp until io.eof?
       end
     end
@@ -56,22 +58,4 @@ class FormulaVersions
   ensure
     Homebrew.raise_deprecation_exceptions = false
   end
-
-  def bottle_version_map(branch)
-    map = Hash.new { |h, k| h[k] = [] }
-
-    versions_seen = 0
-    rev_list(branch) do |rev|
-      formula_at_revision(rev) do |f|
-        bottle = f.bottle_specification
-        map[f.pkg_version] << bottle.rebuild unless bottle.checksums.empty?
-        versions_seen = (map.keys + [f.pkg_version]).uniq.length
-      end
-      return map if versions_seen > MAX_VERSIONS_DEPTH
-    rescue MacOSVersionError => e
-      odebug "#{e} in #{name} at revision #{rev}"
-      break
-    end
-    map
-  end
 end