diff --git a/src/core/census/context.h b/src/core/census/context.h
index 28f6ffff03b56bafdb3b61d91da34e910d043462..49ddd677363794e37b1f24276ca6121136ebb2d9 100644
--- a/src/core/census/context.h
+++ b/src/core/census/context.h
@@ -36,7 +36,7 @@
 
 #include <grpc/census.h>
 
-#define GRPC_CENSUS_MAX_ON_THE_WIRE_TAG_BYTES 4096
+#define GRPC_CENSUS_MAX_ON_THE_WIRE_TAG_BYTES 2048
 
 /* census_context is the in-memory representation of information needed to
  * maintain tracing, RPC statistics and resource usage information. */
diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 171538dc3423e91520a36a80608b896b82856650..4affafa5850d9828a90655a2193c7b63e6070f39 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -70,7 +70,7 @@ typedef struct {
   int success;
 } completed_request;
 
-#define MAX_SEND_EXTRA_METADATA_COUNT 4
+#define MAX_SEND_EXTRA_METADATA_COUNT 3
 
 /* Status data for a request can come from several sources; this
    enumerates them all, and acts as a priority sorting for which
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c
index fae66e2694619ed00853f7c3ce295c9ea22fc7f3..859197412bb4ee9a95fde563bd804c1d743346bd 100644
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@@ -40,7 +40,6 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
-#include "src/core/census/context.h"
 #include "src/core/client_config/resolver_registry.h"
 #include "src/core/iomgr/iomgr.h"
 #include "src/core/support/string.h"
@@ -168,7 +167,7 @@ static grpc_call *grpc_channel_create_call_internal(
     grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask,
     grpc_completion_queue *cq, grpc_mdelem *path_mdelem,
     grpc_mdelem *authority_mdelem, gpr_timespec deadline) {
-  grpc_mdelem *send_metadata[3];
+  grpc_mdelem *send_metadata[2];
   size_t num_metadata = 0;
 
   GPR_ASSERT(channel->is_client);
@@ -180,16 +179,6 @@ static grpc_call *grpc_channel_create_call_internal(
     send_metadata[num_metadata++] = GRPC_MDELEM_REF(channel->default_authority);
   }
 
-  if (propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) {
-    char buf[GRPC_CENSUS_MAX_ON_THE_WIRE_TAG_BYTES];
-    size_t len = census_context_serialize(
-        census_context_current(), buf, GRPC_CENSUS_MAX_ON_THE_WIRE_TAG_BYTES);
-    if (len > 0) {
-      grpc_mdelem *census_mdelem = grpc_mdelem_from_metadata_strings(
-          GRPC_MDSTR_CENSUS, grpc_mdstr_from_buffer((gpr_uint8 *)buf, len));
-      send_metadata[num_metadata++] = census_mdelem;
-    }
-  }
   return grpc_call_create(channel, parent_call, propagation_mask, cq, NULL,
                           send_metadata, num_metadata, deadline);
 }
diff --git a/src/core/transport/static_metadata.h b/src/core/transport/static_metadata.h
index 563630f29b078799fe1474005d3cccd335e7dc55..0e630b1b034722bb511da0ac44642827cbcaa01a 100644
--- a/src/core/transport/static_metadata.h
+++ b/src/core/transport/static_metadata.h
@@ -33,11 +33,11 @@
  * WARNING: Auto-generated code.
  *
  * To make changes to this file, change
- *tools/codegen/core/gen_static_metadata.py,
+ * tools/codegen/core/gen_static_metadata.py,
  * and then re-run it.
  *
  * See metadata.h for an explanation of the interface here, and metadata.c for
- *an
+ * an
  * explanation of what's going on.
  */