Closes Homebrew/homebrew#6801. Closes Homebrew/homebrew#8271. Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>