This simplifies 17931bed by not
overriding ~/.bashrc (that according to our ~/.bash_profile can be
modified by end users)