diff --git a/grpclb.go b/grpclb.go
index b313b39d..bc2b4452 100644
--- a/grpclb.go
+++ b/grpclb.go
@@ -19,7 +19,6 @@
 package grpc
 
 import (
-	"net"
 	"strconv"
 	"strings"
 	"sync"
@@ -127,16 +126,6 @@ func (b *lbBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) bal
 		target = targetSplitted[1]
 	}
 
-	// Remove port number from target if it exists.
-	if host, _, err := net.SplitHostPort(target); err == nil {
-		// When err is not nil, target remains unchanged.
-		//
-		// Possible non-nil err values:
-		// - missing port in address: no port to strip
-		// - other errors: failed to parse
-		target = host
-	}
-
 	lb := &lbBalancer{
 		cc:              newLBCacheClientConn(cc),
 		target:          target,
diff --git a/grpclb/grpclb_test.go b/grpclb/grpclb_test.go
index 78fb599f..a62d5903 100644
--- a/grpclb/grpclb_test.go
+++ b/grpclb/grpclb_test.go
@@ -313,7 +313,7 @@ func newLoadBalancer(numberOfBackends int) (tss *testServers, cleanup func(), er
 	return
 }
 
-func testGRPCLBSimple(t *testing.T, target string) {
+func TestGRPCLB(t *testing.T) {
 	defer leakcheck.Check(t)
 
 	r, cleanup := manual.GenerateAndRegisterManualResolver()
@@ -341,7 +341,7 @@ func testGRPCLBSimple(t *testing.T, target string) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	cc, err := grpc.DialContext(ctx, r.Scheme()+":///"+target,
+	cc, err := grpc.DialContext(ctx, r.Scheme()+":///"+beServerName,
 		grpc.WithTransportCredentials(&creds), grpc.WithDialer(fakeNameDialer))
 	if err != nil {
 		t.Fatalf("Failed to dial to the backend %v", err)
@@ -360,17 +360,6 @@ func testGRPCLBSimple(t *testing.T, target string) {
 	}
 }
 
-func TestGRPCLB(t *testing.T) {
-	testGRPCLBSimple(t, beServerName)
-}
-
-// TestGRPCLBWithPort is same as TestGRPCLB, expect that the dialing target
-// contains fake port number ":8080". The purpose of this test is to make sure
-// that grpclb strips port number from the dialing target in init request.
-func TestGRPCLBWithPort(t *testing.T) {
-	testGRPCLBSimple(t, beServerName+":8080")
-}
-
 // The remote balancer sends response with duplicates to grpclb client.
 func TestGRPCLBWeighted(t *testing.T) {
 	defer leakcheck.Check(t)