diff --git a/terraform/context.go b/terraform/context.go
index 2bfc7df55..41f5e2a36 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -398,7 +398,7 @@ func (c *Context) Apply() (*State, error) {
 			Module:    c.module,
 			Diff:      c.diff,
 			State:     c.state,
-			Providers: c.providersList(),
+			Providers: c.components.ResourceProviders(),
 		}).Build(RootModulePath)
 	} else {
 		newGraph, err = (&ApplyGraphBuilder{
@@ -438,6 +438,11 @@ func (c *Context) Apply() (*State, error) {
 		log.Printf("[WARN] terraform: real graph is experiment, shadow is experiment")
 		real = shadow
 	} else {
+		// TODO: remove before branch is done, we're just not ready for this yet
+		if c.destroy {
+			shadow = nil
+		}
+
 		log.Printf("[WARN] terraform: real graph is original, shadow is experiment")
 	}