diff --git a/wsdlgo/encoder.go b/wsdlgo/encoder.go
index f90a8c2..bca94ca 100644
--- a/wsdlgo/encoder.go
+++ b/wsdlgo/encoder.go
@@ -469,7 +469,7 @@ func (ge *goEncoder) writeGoFuncs(w io.Writer, d *wsdl.Definitions) error {
 		ok := ge.writeSOAPFunc(w, d, op, in, out, ret, outParams[0].xmlToken)
 		if !ok {
 			ge.needsStdPkg["errors"] = true
-			ge.needsExtPkg["golang.org/x/net/context"] = true
+			ge.needsStdPkg["context"] = true
 			in = append([]string{"ctx context.Context"}, in...)
 			ge.fixParamConflicts(in, out)
 			fn := ge.fixFuncNameConflicts(strings.Title(op.Name))
@@ -503,7 +503,8 @@ func (ge *goEncoder) writeSOAPFunc(w io.Writer, d *wsdl.Definitions, op *wsdl.Op
 	if _, exists := ge.soapOps[op.Name]; !exists {
 		return false
 	}
-	if len(in) != 1 || len(out) != 2 {
+	// TODO: handle other input params: e.g. SOAP headers.
+	if len(in) < 1 || len(out) != 2 {
 		return false
 	}
 	ge.needsStdPkg["encoding/xml"] = true
diff --git a/wsdlgo/testdata/tpexample1.golden b/wsdlgo/testdata/tpexample1.golden
index 015b1cb..3ac4443 100644
--- a/wsdlgo/testdata/tpexample1.golden
+++ b/wsdlgo/testdata/tpexample1.golden
@@ -2,8 +2,7 @@ package hello_binding
 
 import (
 	"errors"
-
-	"golang.org/x/net/context"
+	"context"
 )
 
 // SayHello was auto-generated from WSDL.
diff --git a/wsdlgo/testdata/w3cexample1.golden b/wsdlgo/testdata/w3cexample1.golden
index 096f08a..cb200fc 100644
--- a/wsdlgo/testdata/w3cexample1.golden
+++ b/wsdlgo/testdata/w3cexample1.golden
@@ -1,9 +1,8 @@
 package internal
 
 import (
+	"context"
 	"errors"
-
-	"golang.org/x/net/context"
 )
 
 // GetTerm was auto-generated from WSDL.
diff --git a/wsdlgo/testdata/w3cexample2.golden b/wsdlgo/testdata/w3cexample2.golden
index 3bc4db7..ffcea52 100644
--- a/wsdlgo/testdata/w3cexample2.golden
+++ b/wsdlgo/testdata/w3cexample2.golden
@@ -1,9 +1,8 @@
 package internal
 
 import (
+	"context"
 	"errors"
-
-	"golang.org/x/net/context"
 )
 
 // SetTerm was auto-generated from WSDL.