diff --git a/gapi/gapi.go b/gapi/gapi.go
index 31aa146f..700b68cf 100644
--- a/gapi/gapi.go
+++ b/gapi/gapi.go
@@ -73,7 +73,6 @@ type Data struct {
 	Hostname      string // uuid for the host, required for GAPI
 	World         engine.World
 	Noop          bool
-	NoConfigWatch bool
 	NoStreamWatch bool
 	Prefix        string
 	Debug         bool
diff --git a/langpuppet/gapi.go b/langpuppet/gapi.go
index 98a7c4f8..251e0b81 100644
--- a/langpuppet/gapi.go
+++ b/langpuppet/gapi.go
@@ -167,7 +167,6 @@ func (obj *GAPI) Init(data *gapi.Data) error {
 		Hostname:      obj.data.Hostname,
 		World:         obj.data.World,
 		Noop:          obj.data.Noop,
-		NoConfigWatch: obj.data.NoConfigWatch,
 		NoStreamWatch: obj.data.NoStreamWatch,
 		Debug:         obj.data.Debug,
 		Logf: func(format string, v ...interface{}) {
@@ -179,7 +178,6 @@ func (obj *GAPI) Init(data *gapi.Data) error {
 		Hostname:      obj.data.Hostname,
 		World:         obj.data.World,
 		Noop:          obj.data.Noop,
-		NoConfigWatch: obj.data.NoConfigWatch,
 		NoStreamWatch: obj.data.NoStreamWatch,
 		Debug:         obj.data.Debug,
 		Logf: func(format string, v ...interface{}) {
diff --git a/lib/cli.go b/lib/cli.go
index 3c9d87ae..1d785733 100644
--- a/lib/cli.go
+++ b/lib/cli.go
@@ -72,10 +72,6 @@ func CLI(program, version string, flags Flags) error {
 			Name:  "no-watch",
 			Usage: "do not update graph under any switch events",
 		},
-		cli.BoolFlag{
-			Name:  "no-config-watch",
-			Usage: "do not update graph on config switch events",
-		},
 		cli.BoolFlag{
 			Name:  "no-stream-watch",
 			Usage: "do not update graph on stream switch events",
diff --git a/lib/main.go b/lib/main.go
index 1d26771f..29a77777 100644
--- a/lib/main.go
+++ b/lib/main.go
@@ -75,7 +75,6 @@ type Main struct {
 	DeployFs engine.Fs    // used for static deploys
 
 	NoWatch       bool // do not change graph under any circumstances
-	NoConfigWatch bool // do not update graph due to config changes
 	NoStreamWatch bool // do not update graph due to stream changes
 	NoDeployWatch bool // do not change deploys after an initial deploy
 
@@ -140,9 +139,8 @@ func (obj *Main) Init() error {
 	// if we've turned off watching, then be explicit and disable them all!
 	// if all the watches are disabled, then it's equivalent to no watching
 	if obj.NoWatch {
-		obj.NoConfigWatch = true
 		obj.NoStreamWatch = true
-	} else if obj.NoConfigWatch && obj.NoStreamWatch {
+	} else if obj.NoStreamWatch {
 		obj.NoWatch = true
 	}
 
@@ -554,7 +552,6 @@ func (obj *Main) Run() error {
 					Noop:     mainDeploy.Noop,
 					// FIXME: should the below flags come from the deploy struct?
 					//NoWatch:  obj.NoWatch,
-					NoConfigWatch: obj.NoConfigWatch,
 					NoStreamWatch: obj.NoStreamWatch,
 					Prefix:        fmt.Sprintf("%s/", path.Join(prefix, "gapi")),
 					Debug:         obj.Flags.Debug,
diff --git a/lib/run.go b/lib/run.go
index cfdcd373..48704a9d 100644
--- a/lib/run.go
+++ b/lib/run.go
@@ -87,7 +87,6 @@ func run(c *cli.Context, name string, gapiObj gapi.GAPI) error {
 	}
 
 	obj.NoWatch = cliContext.Bool("no-watch")
-	obj.NoConfigWatch = cliContext.Bool("no-config-watch")
 	obj.NoStreamWatch = cliContext.Bool("no-stream-watch")
 	obj.NoDeployWatch = cliContext.Bool("no-deploy-watch")
 
diff --git a/puppet/gapi.go b/puppet/gapi.go
index 7c6afe3a..f3ffb4dd 100644
--- a/puppet/gapi.go
+++ b/puppet/gapi.go
@@ -294,8 +294,6 @@ func (obj *GAPI) Next() chan gapi.Next {
 		close(startChan)                 // kick it off!
 
 		var pChan <-chan time.Time
-		// NOTE: we don't look at obj.data.NoConfigWatch since emulating
-		// puppet means we do not switch graphs on code changes anyways.
 		if obj.data.NoStreamWatch {
 			pChan = nil
 		} else {