Bug 1019071 - Backout 9ccdc477061e. r=me
Bug 1019071 - increase geo.wifi.timeToWaitBeforeSending. r=garvank