I went back to bash as my default shell and also ditched iTerm2 in favor of the stock Terminal.app.