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