Merge "Remove previous attempt at WiFi" into pi-dev