diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
index c1d389725ae8..6749b3c681fb 100644
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -149,6 +149,7 @@ func mainRet() int {
 			ConfigRoot: repoPath,
 			LoadConfig: loadConfig,
 			ReqLog:     &oldcmds.ReqLog{},
+			Plugins:    plugins,
 			ConstructNode: func() (n *core.IpfsNode, err error) {
 				if req == nil {
 					return nil, errors.New("constructing node without a request")
@@ -162,8 +163,7 @@ func mainRet() int {
 				// ok everything is good. set it on the invocation (for ownership)
 				// and return it.
 				n, err = core.NewNode(ctx, &core.BuildCfg{
-					Repo:    r,
-					Plugins: plugins,
+					Repo: r,
 				})
 				if err != nil {
 					return nil, err
diff --git a/commands/request.go b/commands/request.go
index 4711024ad844..3ab5f04da18d 100644
--- a/commands/request.go
+++ b/commands/request.go
@@ -12,10 +12,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ipfs/go-ipfs/core"
-	"github.com/ipfs/go-ipfs/repo/config"
-	u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
+	core "github.com/ipfs/go-ipfs/core"
+	loader "github.com/ipfs/go-ipfs/plugin/loader"
+	config "github.com/ipfs/go-ipfs/repo/config"
 
+	u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
 	"gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
 	"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
 	"gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
@@ -25,6 +26,7 @@ type Context struct {
 	Online     bool
 	ConfigRoot string
 	ReqLog     *ReqLog
+	Plugins    *loader.PluginLoader
 
 	config     *config.Config
 	LoadConfig func(path string) (*config.Config, error)
diff --git a/core/builder.go b/core/builder.go
index c21a4bf458e6..b4c306ac668b 100644
--- a/core/builder.go
+++ b/core/builder.go
@@ -15,7 +15,6 @@ import (
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	resolver "github.com/ipfs/go-ipfs/path/resolver"
 	pin "github.com/ipfs/go-ipfs/pin"
-	loader "github.com/ipfs/go-ipfs/plugin/loader"
 	repo "github.com/ipfs/go-ipfs/repo"
 	cfg "github.com/ipfs/go-ipfs/repo/config"
 	"github.com/ipfs/go-ipfs/thirdparty/verifbs"
@@ -49,7 +48,6 @@ type BuildCfg struct {
 	Routing RoutingOption
 	Host    HostOption
 	Repo    repo.Repo
-	Plugins *loader.PluginLoader
 }
 
 func (cfg *BuildCfg) getOpt(key string) bool {