Gittrac #4115:  Oops -- forgot these in the last commit.