Revert "Always build bottles universally."

This reverts commit 72a477f2734939d4c5805247588c4cdea69b5383.

2 files changed, 1 insertions, 3 deletions

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 4557825c9..25d19e2e7 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -85,7 +85,7 @@ module HomebrewArgvExtension
   end
 
   def build_universal?
-    include? '--universal' or build_bottle?
+    include? '--universal'
   end
 
   # Request a 32-bit only build.
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index c239966de..4db3cd504 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -377,9 +377,7 @@ Please take one of the following actions:
     append flags, xarch unless xarch.empty?
 
     if ARGV.build_bottle?
-      ohai "Building a universal bottle."
       append flags, '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle
-      universal_binary
     else
       # Don't set -msse3 and older flags because -march does that for us
       append flags, '-march=' + map.fetch(Hardware.intel_family, default)