diff --git a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
index 9bcfddb..ad0165e 100644
--- a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
+++ b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
@@ -54,8 +54,6 @@
         byte[] b64 = Base64.decode(new String(data, StandardCharsets.ISO_8859_1), Base64.DEFAULT);
         Log.d(TAG, "Decoded: " + b64.length + " bytes.");
 
-        dropFile(Uri.parse(uriString), context);
-
         MIMEContainer mimeContainer = new
                 MIMEContainer(new LineNumberReader(
                 new InputStreamReader(new ByteArrayInputStream(b64), StandardCharsets.ISO_8859_1)),
@@ -79,14 +77,6 @@
         return parse(inner);
     }
 
-    private static void dropFile(Uri uri, Context context) {
-        if (DocumentsContract.isDocumentUri(context, uri)) {
-            DocumentsContract.deleteDocument(context.getContentResolver(), uri);
-        } else {
-            context.getContentResolver().delete(uri, null, null);
-        }
-    }
-
     private static WifiConfiguration parse(MIMEContainer root)
             throws IOException, GeneralSecurityException, SAXException {
 
