Backout part of Bug 812179 for SeaMonkey bustage. rs+=gps