diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 6ddf48904a..be0f42f15f 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -629,16 +629,15 @@ module Homebrew
       old_bottle_spec = formula.bottle_specification
       old_bottle_spec_matches = old_bottle_spec &&
                                 bottle_hash["formula"]["pkg_version"] == formula.pkg_version.to_s &&
-                                bottle.rebuild  != old_bottle_spec.rebuild &&
                                 bottle.root_url == old_bottle_spec.root_url &&
                                 old_bottle_spec.collector.tags.present?
 
       # if all the cellars and checksums are the same: we can create an
       # `all: $SHA256` bottle.
       tag_hashes = bottle_hash["bottle"]["tags"].values
-      all_bottle = !old_bottle_spec_matches && (tag_hashes.count > 1) && tag_hashes.uniq do |tag_hash|
-        "#{tag_hash["cellar"]}-#{tag_hash["sha256"]}"
-      end.count == 1
+      all_bottle = (!old_bottle_spec_matches || bottle.rebuild != old_bottle_spec.rebuild) &&
+                   tag_hashes.count > 1 &&
+                   tag_hashes.uniq { |tag_hash| "#{tag_hash["cellar"]}-#{tag_hash["sha256"]}" }.count == 1
 
       bottle_hash["bottle"]["tags"].each do |tag, tag_hash|
         cellar = tag_hash["cellar"]
@@ -661,7 +660,7 @@ module Homebrew
         next
       end
 
-      no_bottle_changes = if old_bottle_spec_matches
+      no_bottle_changes = if old_bottle_spec_matches && bottle.rebuild != old_bottle_spec.rebuild
         bottle.collector.tags.all? do |tag|
           tag_spec = bottle.collector.specification_for(tag)
           next false if tag_spec.blank?