Port upstream homebrew formula changes