Restored another previous fix clobbered by a merge.
Restored another previous fix clobbered by a merge.

ajoubert-mitre/geoq,Pkthunder/geoq,jdaigneau/geoq,stephenrjones/geoq,khazhyk/geoq,ajoubert-mitre/geoq,meilinger/geoq,ngageoint/geoq,stephenrjones/geoq,ngageoint/geoq,stephenrjones/geoq,jdaigneau/geoq,jdaigneau/geoq,khazhyk/geoq,Pkthunder/geoq,meilinger/geoq,Pkthunder/geoq,ngageoint/geoq,ngageoint/geoq,meilinger/geoq,ajoubert-mitre/geoq,khazhyk/geoq