diff --git a/core/java/com/android/internal/util/FunctionalUtils.java b/core/java/com/android/internal/util/FunctionalUtils.java
index 720f4feeaebed..3c9791791a689 100644
--- a/core/java/com/android/internal/util/FunctionalUtils.java
+++ b/core/java/com/android/internal/util/FunctionalUtils.java
@@ -16,16 +16,12 @@
 
 package com.android.internal.util;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.os.RemoteException;
 import android.util.ExceptionUtils;
 
-import java.util.Collection;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 /**
@@ -222,20 +218,4 @@ public class FunctionalUtils {
             }
         }
     }
-
-    /**
-     * Find the first element in the list that matches the predicate.
-     *
-     * The standard Java way of doing this is to use streams, which is very expensive.
-     *
-     * @return the first matching element, or null if none.
-     */
-    @Nullable
-    public static <T> T findFirst(@NonNull final Collection<T> haystack,
-            @NonNull final Predicate<T> p) {
-        for (final T needle : haystack) {
-            if (p.test(needle)) return needle;
-        }
-        return null;
-    }
 }
diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/services/core/java/com/android/server/connectivity/NetworkRanker.java
index c536ab25e9254..1ae7dc5c36767 100644
--- a/services/core/java/com/android/server/connectivity/NetworkRanker.java
+++ b/services/core/java/com/android/server/connectivity/NetworkRanker.java
@@ -16,13 +16,8 @@
 
 package com.android.server.connectivity;
 
-import static android.net.NetworkScore.POLICY_IGNORE_ON_WIFI;
-
-import static com.android.internal.util.FunctionalUtils.findFirst;
-
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
 
 import java.util.ArrayList;
@@ -42,33 +37,15 @@ public class NetworkRanker {
             @NonNull final Collection<NetworkAgentInfo> nais) {
         final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais);
         candidates.removeIf(nai -> !nai.satisfies(request));
-        // Enforce policy.
-        filterBadWifiAvoidancePolicy(candidates);
 
         NetworkAgentInfo bestNetwork = null;
         int bestScore = Integer.MIN_VALUE;
         for (final NetworkAgentInfo nai : candidates) {
-            final int score = nai.getCurrentScore();
-            if (score > bestScore) {
+            if (nai.getCurrentScore() > bestScore) {
                 bestNetwork = nai;
-                bestScore = score;
+                bestScore = nai.getCurrentScore();
             }
         }
         return bestNetwork;
     }
-
-    // If some network with wifi transport is present, drop all networks with POLICY_IGNORE_ON_WIFI.
-    private void filterBadWifiAvoidancePolicy(
-            @NonNull final ArrayList<NetworkAgentInfo> candidates) {
-        final NetworkAgentInfo wifi = findFirst(candidates,
-                nai -> nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-                        && nai.everValidated
-                        // Horrible hack : there is old UI that will let a user say they want to
-                        // override the policy only for this network only at this time and it
-                        // feeds into the following member. This old UI should probably be removed
-                        // but for now keep backward compatibility.
-                        && !nai.avoidUnvalidated);
-        if (null == wifi) return; // No wifi : this policy doesn't apply
-        candidates.removeIf(nai -> nai.getNetworkScore().hasPolicy(POLICY_IGNORE_ON_WIFI));
-    }
 }
diff --git a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
index a6b371a23b587..86c91165f61b1 100644
--- a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
+++ b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
@@ -16,7 +16,6 @@
 
 package com.android.server.connectivity
 
-import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import androidx.test.filters.SmallTest
 import androidx.test.runner.AndroidJUnit4
@@ -36,7 +35,6 @@ class NetworkRankerTest {
     private fun makeNai(satisfy: Boolean, score: Int) = mock(NetworkAgentInfo::class.java).also {
         doReturn(satisfy).`when`(it).satisfies(any())
         doReturn(score).`when`(it).currentScore
-        it.networkCapabilities = NetworkCapabilities()
     }
 
     @Test