diff --git a/pkg/cmd/server/kubernetes/node_config.go b/pkg/cmd/server/kubernetes/node_config.go
index <HASH>..<HASH> 100644
--- a/pkg/cmd/server/kubernetes/node_config.go
+++ b/pkg/cmd/server/kubernetes/node_config.go
@@ -176,12 +176,17 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error
 	// docker-in-docker (dind) deployments are used for testing
 	// networking plugins.  Running openshift under dind won't work
 	// with the real oom adjuster due to the state of the cgroups path
-	// in a dind container that uses systemd for init.
+	// in a dind container that uses systemd for init.  Similarly,
+	// cgroup manipulation of the nested docker daemon doesn't work
+	// properly under centos/rhel and should be disabled by setting
+	// the name of the container to an empty string.
 	//
-	// TODO(marun) Make dind cgroups compatible with openshift
+	// This workaround should become unnecessary once user namespaces
 	if value := cmdutil.Env("OPENSHIFT_DIND", ""); value == "true" {
 		glog.Warningf("Using FakeOOMAdjuster for docker-in-docker compatibility")
 		cfg.OOMAdjuster = oom.NewFakeOOMAdjuster()
+		glog.Warningf("Disabling cgroup manipulation of nested docker daemon for docker-in-docker compatibility")
+		cfg.DockerDaemonContainer = ""
 	}
 
 	// Setup auth
Fix dind compatibility with centos/rhel

Kubelet's cgroup manipulation of the dind daemon is not compatible with
centos/rhel.  This change disables the offending cgroup manipulation
when the kubelet is running with dind.