googleapis
diff --git a/‎packages/bigtable/system-test/bigtable.js‎
Lines changed: 1 addition & 4 deletions b/‎packages/bigtable/system-test/bigtable.js‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎packages/common/src/grpc-service.js‎
Lines changed: 16 additions & 21 deletions b/‎packages/common/src/grpc-service.js‎
Lines changed: 16 additions & 21 deletions
diff --git a/‎packages/common/src/util.js‎
Lines changed: 4 additions & 0 deletions b/‎packages/common/src/util.js‎
Lines changed: 4 additions & 0 deletions
@@ -274,10 +274,7 @@ describe('Bigtable', function() {
 
     it('should get the tables metadata', function(done) {
       TABLE.getMetadata(function(err, metadata) {
-        assert.strictEqual(
-          metadata.name,
-          TABLE.id.replace('{{projectId}}', bigtable.projectId)
-        );
+        assert.strictEqual(metadata.name, TABLE.id);
         done();
       });
     });
 
@@ -241,10 +241,6 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
     return;
   }
 
-  // Clean up gcloud-specific options.
-  delete reqOpts.autoPaginate;
-  delete reqOpts.autoPaginateVal;
-
   var service = this.getService_(protoOpts);
 
   var metadata = this.grpcMetadata;
@@ -254,6 +250,13 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
     grpcOpts.deadline = GrpcService.createDeadline_(protoOpts.timeout);
   }
 
+  try {
+    reqOpts = util.decorateRequest(reqOpts, { projectId: self.projectId });
+  } catch(e) {
+    callback(e);
+    return;
+  }
+
   // Retains a reference to an error from the response. If the final callback is
   // executed with this as the "response", we return it to the user as an error.
   var respError;
@@ -269,13 +272,6 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
     request: function(_, onResponse) {
       respError = null;
 
-      try {
-        reqOpts = util.decorateRequest(reqOpts, { projectId: self.projectId });
-      } catch (e) {
-        onResponse(e);
-        return;
-      }
-
       service[protoOpts.method](reqOpts, metadata, grpcOpts, function(e, resp) {
         if (e) {
           respError = GrpcService.decorateError_(e);
@@ -342,17 +338,7 @@ GrpcService.prototype.requestStream = function(protoOpts, reqOpts) {
     return stream;
   }
 
-  try {
-    reqOpts = util.decorateRequest(reqOpts, { projectId: this.projectId });
-  } catch (e) {
-    setImmediate(function() {
-      stream.destroy(e);
-    });
-    return stream;
-  }
-
   var objectMode = !!reqOpts.objectMode;
-  delete reqOpts.objectMode;
 
   var service = this.getService_(protoOpts);
   var grpcOpts = {};
@@ -361,6 +347,15 @@ GrpcService.prototype.requestStream = function(protoOpts, reqOpts) {
     grpcOpts.deadline = GrpcService.createDeadline_(protoOpts.timeout);
   }
 
+  try {
+    reqOpts = util.decorateRequest(reqOpts, { projectId: this.projectId });
+  } catch(e) {
+    setImmediate(function() {
+      stream.destroy(e);
+    });
+    return stream;
+  }
+
   var retryOpts = {
     retries: this.maxRetries,
     objectMode: objectMode,
 
@@ -479,6 +479,10 @@ util.makeRequest = makeRequest;
 function decorateRequest(reqOpts, config) {
   config = config || {};
 
+  delete reqOpts.autoPaginate;
+  delete reqOpts.autoPaginateVal;
+  delete reqOpts.objectMode;
+
   if (is.object(reqOpts.qs)) {
     delete reqOpts.qs.autoPaginate;
     delete reqOpts.qs.autoPaginateVal;