Swapped the location services stuff around.