From 8cb799c7897c029863cd9051b8e033991d29fe88 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair@redhat.com>
Date: Wed, 20 Jul 2016 08:47:15 -0500
Subject: [PATCH] Revert "Follow on for 1.4 to default HTTP2 on by default"

This reverts commit efe25553cdb28c8ce69e8e1c381bf011637ef718.
---
 pkg/util/net/http.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg/util/net/http.go b/pkg/util/net/http.go
index 582fb9a58f2..53f28dfca25 100644
--- a/pkg/util/net/http.go
+++ b/pkg/util/net/http.go
@@ -77,10 +77,8 @@ func SetOldTransportDefaults(t *http.Transport) *http.Transport {
 // for the Proxy, Dial, and TLSHandshakeTimeout fields if unset
 func SetTransportDefaults(t *http.Transport) *http.Transport {
 	t = SetOldTransportDefaults(t)
-	// Allow clients to disable http2 if needed.
-	if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
-		glog.Infof("HTTP2 has been explicitly disabled")
-	} else {
+	// Allow HTTP2 clients but default off for now
+	if s := os.Getenv("ENABLE_HTTP2"); len(s) > 0 {
 		if err := http2.ConfigureTransport(t); err != nil {
 			glog.Warningf("Transport failed http2 configuration: %v", err)
 		}