Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"

This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.

Test: None
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 3994ec0..93a0535 100644
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -1163,9 +1163,6 @@
 					msg.group_id, msg.group_id_len);
 	}
 
-	if (reject != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE)
-		p2ps_prov_free(p2p);
-
 	if (reject == P2P_SC_SUCCESS) {
 		switch (config_methods) {
 		case WPS_CONFIG_DISPLAY:
@@ -1584,7 +1581,7 @@
 					 report_config_methods);
 
 	if (p2p->state == P2P_PD_DURING_FIND) {
-		p2p_stop_listen_for_freq(p2p, 0);
+		p2p_clear_timeout(p2p);
 		p2p_continue_find(p2p);
 	}
 }