diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb
index 0dd7341ea1..18312c9fa8 100644
--- a/Library/Homebrew/extend/os/mac/utils/bottles.rb
+++ b/Library/Homebrew/extend/os/mac/utils/bottles.rb
@@ -38,7 +38,6 @@ module Utils
 
       # Allows a bottle tag to specify a specific OS or later,
       # so the same bottle can target multiple OSs.
-      # Not used in core, used in taps.
       def find_or_later_tag(tag)
         begin
           tag_version = MacOS::Version.from_symbol(tag)
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index bb432e2dd5..f368c59b54 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -221,7 +221,7 @@ class Bottle
     def initialize(name, version, tag, rebuild)
       @name = name
       @version = version
-      @tag = tag
+      @tag = tag.to_s.gsub(/_or_later$/, "")
       @rebuild = rebuild
     end