diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
index f55364325a..fe13bf9af7 100644
--- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
+++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
@@ -485,16 +485,17 @@ private void onFailure(Throwable t) {
     private void onSuccess(AppendRowsResponse response) {
       for (int i = 0; i < inflightRequests.size(); i++) {
         AppendRowsResponse.Builder singleResponse = response.toBuilder();
-        if (offsetList.get(i) > 0) {
-          // singleResponse.setOffset(offsetList.get(i));
-        } else {
-          long actualOffset = response.getOffset();
-          for (int j = 0; j < i; j++) {
-            actualOffset +=
-                inflightRequests.get(j).message.getProtoRows().getRows().getSerializedRowsCount();
-          }
-          // singleResponse.setOffset(actualOffset);
-        }
+        // if (offsetList.get(i) > 0) {
+        //   singleResponse.setOffset(offsetList.get(i));
+        // } else {
+        //   long actualOffset = response.getOffset();
+        //   for (int j = 0; j < i; j++) {
+        //     actualOffset +=
+        //
+        // inflightRequests.get(j).message.getProtoRows().getRows().getSerializedRowsCount();
+        //   }
+        //  singleResponse.setOffset(actualOffset);
+        // }
         inflightRequests.get(i).appendResult.set(singleResponse.build());
       }
     }
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java
index dd7987d796..28cc4d93af 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java
@@ -908,10 +908,8 @@ public void testFlushAll() throws Exception {
     ApiFuture<AppendRowsResponse> appendFuture1 = sendTestMessage(writer, new String[] {"A"});
     ApiFuture<AppendRowsResponse> appendFuture2 = sendTestMessage(writer, new String[] {"B"});
     ApiFuture<AppendRowsResponse> appendFuture3 = sendTestMessage(writer, new String[] {"C"});
-
     assertFalse(appendFuture3.isDone());
     writer.flushAll(100000);
-
     assertTrue(appendFuture3.isDone());
 
     writer.close();
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryWriteManualClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryWriteManualClientTest.java
index 5dd73c0d80..834226110e 100644
--- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryWriteManualClientTest.java
+++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryWriteManualClientTest.java
@@ -257,6 +257,7 @@ public void testJsonStreamWriterBatchWriteWithCommittedStream()
 
       ApiFuture<AppendRowsResponse> response =
           jsonStreamWriter.append(row, -1, /* allowUnknownFields */ false);
+
       // Temp for Breaking Change.
       response.get();
       // assertEquals(0, response.get().getOffset());