partial backout of the checkin from bug 103121, because it collided with the patch from bug 51519.  This should satifactorily meet the goals of both patches.  patch by kiko, r= justdave
partial backout of the checkin from bug 103121, because it collided with the patch from bug 51519.  This should satifactorily
meet the goals of both patches.  patch by kiko, r= justdave

ikpcdoctor/git-clone---branch-release-5.0-stable-https-git.mozilla.org-bugzilla-bugzilla-,edmorley/bugzilla,oyang/bugzilla,edmorley/bugzilla,talatdayyan/bugzilla,oyang/bugzilla,talatdayyan/bugzilla,edmorley/bugzilla,bugzilla/bugzilla,bugzilla/bugzilla,dylanwh/bugzilla,GNOME/bugzilla-gnome-org-upstream,ikpcdoctor/git-clone---branch-release-5.0-stable-https-git.mozilla.org-bugzilla-bugzilla-,dylanwh/bugzilla,ikpcdoctor/git-clone---branch-release-5.0-stable-https-git.mozilla.org-bugzilla-bugzilla-,dylanwh/bugzilla,dklawren/bugzilla,dklawren/bugzilla,GNOME/bugzilla-gnome-org-upstream,dylanwh/bugzilla,oyang/bugzilla,oyang/bugzilla,dylanwh/bugzilla,bugzilla/bugzilla,talatdayyan/bugzilla,edmorley/bugzilla,edmorley/bugzilla,GNOME/bugzilla-gnome-org-upstream,ikpcdoctor/git-clone---branch-release-5.0-stable-https-git.mozilla.org-bugzilla-bugzilla-,dklawren/bugzilla,oyang/bugzilla,dklawren/bugzilla,talatdayyan/bugzilla,talatdayyan/bugzilla,GNOME/bugzilla-gnome-org-upstream,bugzilla/bugzilla,ikpcdoctor/git-clone---branch-release-5.0-stable-https-git.mozilla.org-bugzilla-bugzilla-,dklawren/bugzilla,GNOME/bugzilla-gnome-org-upstream