SSP-1697 - restored mygps changes that were clobbered inexplicably in a
previous checkin