Merge "wpa_supplicant appears to require the file"