Revert "Merge pull request #694 from elezar/add-opt-in-to-sockets"

This reverts commit b061446694, reversing
changes made to c490baab63.

Signed-off-by: Evan Lezar <elezar@nvidia.com>

tools/container/toolkit/toolkit.go

@@ -81,8 +81,6 @@ type options struct {
 	acceptNVIDIAVisibleDevicesAsVolumeMounts   bool
 
 	ignoreErrors bool
-
-	optInFeatures cli.StringSlice
 }
 
 func main() {
@@ -252,12 +250,6 @@ func main() {
 			Destination: &opts.createDeviceNodes,
 			EnvVars:     []string{"CREATE_DEVICE_NODES"},
 		},
-		&cli.StringSliceFlag{
-			Name:        "opt-in-feature",
-			Hidden:      true,
-			Destination: &opts.optInFeatures,
-			EnvVars:     []string{"NVIDIA_CONTAINER_TOOLKIT_OPT_IN_FEATURES"},
-		},
 	}
 
 	// Update the subcommand flags with the common subcommand flags
@@ -526,10 +518,6 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai
 		"nvidia-container-runtime.runtimes":                      opts.ContainerRuntimeRuntimes,
 		"nvidia-container-cli.debug":                             opts.ContainerCLIDebug,
 	}
-	for _, feature := range opts.optInFeatures.Value() {
-		optionalConfigValues["features."+feature] = true
-	}
-
 	for key, value := range optionalConfigValues {
 		if !c.IsSet(key) {
 			log.Infof("Skipping unset option: %v", key)