From 399cc56d034a3314f428683b7872b4d67063be9a Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gmail.com>
Date: Tue, 8 Dec 2020 13:00:22 +0100
Subject: [PATCH] Revert "Fix `:arm64_big_sur` bottle ordering."

This reverts commit 66d1b929a5b134ee93caf9237e7074a195c1b523.
---
 Library/Homebrew/hardware.rb       | 8 --------
 Library/Homebrew/os/mac/version.rb | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index f03078f877..88625b72a3 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -11,14 +11,6 @@ module Hardware
     INTEL_64BIT_ARCHS = [:x86_64].freeze
     PPC_32BIT_ARCHS   = [:ppc, :ppc32, :ppc7400, :ppc7450, :ppc970].freeze
     PPC_64BIT_ARCHS   = [:ppc64, :ppc64le, :ppc970].freeze
-    ARM_64BIT_ARCHS   = [:arm64].freeze
-    ALL_ARCHS = [
-      *INTEL_32BIT_ARCHS,
-      *INTEL_64BIT_ARCHS,
-      *PPC_32BIT_ARCHS,
-      *PPC_64BIT_ARCHS,
-      *ARM_64BIT_ARCHS,
-    ].freeze
 
     class << self
       extend T::Sig
diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb
index 75893a1058..6e73ffd6a4 100644
--- a/Library/Homebrew/os/mac/version.rb
+++ b/Library/Homebrew/os/mac/version.rb
@@ -25,11 +25,7 @@ module OS
 
       sig { params(sym: Symbol).returns(T.attached_class) }
       def self.from_symbol(sym)
-        @all_archs_regex ||= /^#{Regexp.union(Hardware::CPU::ALL_ARCHS.map(&:to_s))}_/
-        sym_without_arch = sym.to_s
-                              .sub(@all_archs_regex, "")
-                              .to_sym
-        str = SYMBOLS.fetch(sym_without_arch) { raise MacOSVersionError, sym }
+        str = SYMBOLS.fetch(sym) { raise MacOSVersionError, sym }
         new(str)
       end