Revert "Move useProxyProtocol to Cloud'"

2 files changed, 5 insertions, 10 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
index 463d9edcdad..38705b02a28 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
@@ -57,11 +57,6 @@ public class Cloud {
         return account;
     }
 
-    /** Returns whether load balancers use proxy protocol v1 or not (e.g. use source NAT). */
-    public boolean useProxyProtocol() {
-        return !name.equals(CloudName.AZURE);
-    }
-
     /** For testing purposes only */
     public static Cloud defaultCloud() {
         return new Builder().build();
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index 73c6010f514..30392c17896 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -54,6 +54,11 @@ public class Zone {
         this.region = region;
     }
 
+    // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.327 are gone
+    public Cloud getCloud() {
+        return cloud();
+    }
+
     /** Returns the current cloud */
     public Cloud cloud() { return cloud; }
 
@@ -97,10 +102,5 @@ public class Zone {
         return Objects.hash(environment, region);
     }
 
-    // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.327 are gone
-    @Deprecated(forRemoval = true)
-    public Cloud getCloud() {
-        return cloud();
-    }
 }