[PATCH master] (take II) Fix configuration of protected wireless connections.