Updating setup to work with pre-brew setup.