Let's use upstream patches from https://github.com/Homebrew/homebrew/pull/25718#issuecomment-31812478