diff --git a/Gopkg.lock b/Gopkg.lock
index 9e618fc4ec..f27e7b0d51 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -265,6 +265,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "1983ed98113894a71a542bca2ce73eb6acb4cb32b0369b09bf783b8290c1f3f8"
+  inputs-digest = "46ab70c80670f4ac38628b2f6465d006577c8713eae0be9a6c6be351b38704a0"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 0a5aed1bb6..ecd3b1b797 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -20,6 +20,10 @@
   name = "github.com/golang/protobuf"
   version = "1.0.0"
 
+[[constraint]]
+  name = "golang.org/x/net"
+  branch = "master"
+
 [[constraint]]
   name = "github.com/cloudflare/cfssl"
   branch = "master"
diff --git a/internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go b/internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go
index ebf713df75..b69265e129 100644
--- a/internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go
+++ b/internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go
@@ -33,7 +33,7 @@ type ClientConfig struct {
 	TLS        tls.ClientTLSConfig
 	Enrollment api.EnrollmentRequest
 	CSR        api.CSRInfo
-	ID         core.RegistrationRequest
+	ID         api.RegistrationRequest
 	Revoke     api.RevocationRequest
 	CAInfo     api.GetCAInfoRequest
 	CAName     string           `help:"Name of CA"`
diff --git a/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go b/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go
index 305ae751b5..667ff3f7e9 100644
--- a/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go
+++ b/internal/github.com/hyperledger/fabric/protos/orderer/ab.pb.go
@@ -40,8 +40,7 @@ import math "math"
 import common "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 
 import (
-	context "context"
-
+	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
diff --git a/pkg/fab/mocks/mockendorserserver.go b/pkg/fab/mocks/mockendorserserver.go
index a81e3467f9..a2601dd249 100644
--- a/pkg/fab/mocks/mockendorserserver.go
+++ b/pkg/fab/mocks/mockendorserserver.go
@@ -7,11 +7,11 @@ SPDX-License-Identifier: Apache-2.0
 package mocks
 
 import (
-	"context"
 	"fmt"
 	"net"
 
 	"github.com/golang/protobuf/proto"
+	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	rwsetutil "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
diff --git a/scripts/third_party_pins/fabric/apply_upstream.sh b/scripts/third_party_pins/fabric/apply_upstream.sh
index ec6327920a..09ad90be0c 100755
--- a/scripts/third_party_pins/fabric/apply_upstream.sh
+++ b/scripts/third_party_pins/fabric/apply_upstream.sh
@@ -92,7 +92,6 @@ declare -a PROTOS_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/utils/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/utils/g'
     's/\"github.com\/hyperledger\/fabric\/protos\//\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\//g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
-    's/\"golang.org\/x\/net\/context\"/\"context\"/g'
 )
 eval "INTERNAL_PATH=$THIRDPARTY_FABRIC_API_PATH TMP_PROJECT_PATH=$TMP_PROJECT_PATH IMPORT_SUBSTS=\"${PROTOS_IMPORT_SUBSTS[*]}\" $SCRIPTS_PATH/apply_fabric_protos.sh"
 
@@ -110,7 +109,6 @@ declare -a PROTOS_INTERNAL_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/utils/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/utils/g'
     's/\"github.com\/hyperledger\/fabric\/protos/\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\/protos/g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
-    's/\"golang.org\/x\/net\/context\"/\"context\"/g'
 )
 eval "INTERNAL_PATH=$THIRDPARTY_INTERNAL_FABRIC_PATH TMP_PROJECT_PATH=$TMP_PROJECT_PATH IMPORT_SUBSTS=\"${PROTOS_INTERNAL_IMPORT_SUBSTS[*]}\" $SCRIPTS_PATH/apply_fabric_protos_internal.sh"
 
diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go
index 31075cb952..4837fb3236 100644
--- a/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go
+++ b/third_party/github.com/hyperledger/fabric/protos/peer/events.pb.go
@@ -14,8 +14,7 @@ import common "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyper
 import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
 
 import (
-	context "context"
-
+	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go
index a273b7c50f..e9d5f12176 100644
--- a/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go
+++ b/third_party/github.com/hyperledger/fabric/protos/peer/peer.pb.go
@@ -12,8 +12,7 @@ import fmt "fmt"
 import math "math"
 
 import (
-	context "context"
-
+	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )