Bug 925766 - Remove leftovers from bug 917622, r=gps