Gittrac #4115:  Changes based on yesterday/today's communication
with Brian (see the ticket).