diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddf63af630..b24293238ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,7 +420,7 @@ set(FETCHCONTENT_QUIET OFF)
 FetchContent_Declare(
   p4runtime
   GIT_REPOSITORY https://github.com/p4lang/p4runtime.git
-  GIT_TAG        ec4eb5ef70dbcbcbf2f8357a4b2b8c2f218845a5
+  GIT_TAG        62a9bd60599b87497a15feb6c7893b7ec8ba461f
   GIT_PROGRESS TRUE
 )
 FetchContent_MakeAvailable(p4runtime)
diff --git a/backends/ebpf/psa/examples/bng.p4info.txtpb b/backends/ebpf/psa/examples/bng.p4info.txtpb
index 2ceee929b86..091108ac0f9 100644
--- a/backends/ebpf/psa/examples/bng.p4info.txtpb
+++ b/backends/ebpf/psa/examples/bng.p4info.txtpb
@@ -47,9 +47,6 @@ tables {
     id: 17049673
   }
   const_default_action_id: 28724955
-  initial_default_action {
-    action_id: 28724955
-  }
   size: 8192
 }
 tables {
@@ -89,13 +86,6 @@ tables {
     id: 17126659
   }
   const_default_action_id: 17126659
-  initial_default_action {
-    action_id: 17126659
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-  }
   size: 1024
 }
 tables {
@@ -118,9 +108,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -150,9 +137,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -177,13 +161,6 @@ tables {
     id: 27019812
   }
   const_default_action_id: 27019812
-  initial_default_action {
-    action_id: 27019812
-    arguments {
-      param_id: 1
-      value: "\000\000\000\000"
-    }
-  }
   size: 8192
 }
 tables {
@@ -207,9 +184,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16
 }
 tables {
@@ -245,9 +219,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21552277
-  initial_default_action {
-    action_id: 21552277
-  }
   size: 32768
 }
 tables {
@@ -274,9 +245,6 @@ tables {
     id: 33281717
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 8192
 }
 tables {
@@ -316,9 +284,6 @@ tables {
     id: 23799701
   }
   const_default_action_id: 23799701
-  initial_default_action {
-    action_id: 23799701
-  }
   size: 256
 }
 tables {
@@ -354,9 +319,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 20119496
-  initial_default_action {
-    action_id: 20119496
-  }
   size: 1024
 }
 actions {
diff --git a/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb b/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
index d4ddb4f086d..db7a0c0de3c 100644
--- a/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
+++ b/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 24963522
-  initial_default_action {
-    action_id: 24963522
-  }
   size: 1024
 }
 tables {
@@ -81,9 +75,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -106,9 +97,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 286177969
   size: 1024
 }
@@ -141,9 +129,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -189,9 +174,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -220,9 +202,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 330499363
   size: 1024
 }
diff --git a/backends/ebpf/psa/examples/upf.p4info.txtpb b/backends/ebpf/psa/examples/upf.p4info.txtpb
index f8e96a303cc..937103e69e7 100644
--- a/backends/ebpf/psa/examples/upf.p4info.txtpb
+++ b/backends/ebpf/psa/examples/upf.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -92,9 +86,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -123,9 +114,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -149,9 +137,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -173,9 +158,6 @@ tables {
     id: 28485346
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -235,9 +217,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 19604500
-  initial_default_action {
-    action_id: 19604500
-  }
   size: 1024
 }
 tables {
@@ -262,9 +241,6 @@ tables {
     id: 19604500
   }
   const_default_action_id: 19604500
-  initial_default_action {
-    action_id: 19604500
-  }
   size: 1024
 }
 tables {
@@ -292,9 +268,6 @@ tables {
     id: 23916784
   }
   const_default_action_id: 23916784
-  initial_default_action {
-    action_id: 23916784
-  }
   size: 1024
 }
 actions {
diff --git a/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
index 993b33ff64d..43db0560ce0 100644
--- a/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -52,9 +49,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
index ac8dbc695d5..5d8be1f2270 100644
--- a/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 30183046
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
@@ -46,9 +43,6 @@ tables {
   action_refs {
     id: 30183046
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/backends/ebpf/tests/p4testdata/counters.p4info.txtpb b/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
index 34ee57a2b67..fd3a005e17d 100644
--- a/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
@@ -28,13 +28,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 30696436
-    arguments {
-      param_id: 1
-      value: "\000\000\000\005"
-    }
-  }
   size: 100
 }
 actions {
diff --git a/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb b/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
index 205f9cb03eb..851a90bf221 100644
--- a/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
@@ -25,13 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 30696436
-    arguments {
-      param_id: 1
-      value: "\000\000\000\006"
-    }
-  }
   direct_resource_ids: 358755246
   size: 100
 }
diff --git a/bazel/p4c_deps.bzl b/bazel/p4c_deps.bzl
index ccc75b2e039..3a479222663 100644
--- a/bazel/p4c_deps.bzl
+++ b/bazel/p4c_deps.bzl
@@ -47,8 +47,8 @@ filegroup(
         git_repository(
             name = "com_github_p4lang_p4runtime",
             remote = "https://github.com/p4lang/p4runtime",
-            # Newest commit on main branch as of August 18, 2024.
-            commit = "ec4eb5ef70dbcbcbf2f8357a4b2b8c2f218845a5",
+            # Newest commit on main branch as of May 30, 2024.
+            commit = "62a9bd60599b87497a15feb6c7893b7ec8ba461f",
             shallow_since = "1680213111 -0700",
             strip_prefix = "proto",
         )
diff --git a/control-plane/bytestrings.cpp b/control-plane/bytestrings.cpp
index 7bdd3ddcd46..d18f2b9d77d 100644
--- a/control-plane/bytestrings.cpp
+++ b/control-plane/bytestrings.cpp
@@ -16,27 +16,16 @@ limitations under the License.
 
 #include "bytestrings.h"
 
-#include "control-plane/typeSpecConverter.h"
-#include "frontends/p4/enumInstance.h"
 #include "ir/ir.h"
 #include "lib/algorithm.h"
 
-namespace P4::ControlPlaneAPI {
+namespace P4 {
 
-int getTypeWidth(const IR::Type &type, const TypeMap &typeMap) {
-    TranslationAnnotation annotation;
-    if (hasTranslationAnnotation(&type, &annotation)) {
-        // W if the type is bit<W>, and 0 if the type is string
-        return annotation.controller_type.width;
-    }
-    /* Treat error type as string */
-    if (type.is<IR::Type_Error>()) {
-        return 0;
-    }
-
-    return typeMap.widthBits(&type, type.getNode(), false);
-}
+namespace ControlPlaneAPI {
 
+/// Convert a bignum to the P4Runtime bytes representation. The value must fit
+/// within the provided @width expressed in bits. Padding will be added as
+/// necessary (as the most significant bits).
 std::optional<std::string> stringReprConstant(big_int value, int width) {
     // TODO(antonin): support negative values
     if (value < 0) {
@@ -64,36 +53,19 @@ std::optional<std::string> stringReprConstant(big_int value, int width) {
     return std::string(data.begin(), data.end());
 }
 
+/// Convert a Constant to the P4Runtime bytes representation by calling
+/// stringReprConstant.
 std::optional<std::string> stringRepr(const IR::Constant *constant, int width) {
     return stringReprConstant(constant->value, width);
 }
 
+/// Convert a BoolLiteral to the P4Runtime bytes representation by calling
+/// stringReprConstant.
 std::optional<std::string> stringRepr(const IR::BoolLiteral *constant, int width) {
     auto v = static_cast<big_int>(constant->value ? 1 : 0);
     return stringReprConstant(v, width);
 }
 
-std::optional<std::string> stringRepr(const TypeMap &typeMap, const IR::Expression *expression) {
-    int width = getTypeWidth(*expression->type, typeMap);
-    // If the expression is a cast we keep its width, but use the casted expression for string
-    // representation.
-    while (const auto *cast = expression->to<IR::Cast>()) {
-        expression = cast->expr;
-    }
-    auto *ei = EnumInstance::resolve(expression, &typeMap);
-    if (expression->is<IR::Constant>()) {
-        return stringRepr(expression->to<IR::Constant>(), width);
-    }
-    if (expression->is<IR::BoolLiteral>()) {
-        return stringRepr(expression->to<IR::BoolLiteral>(), width);
-    }
-    if (ei != nullptr && ei->is<SerEnumInstance>()) {
-        auto *sei = ei->to<SerEnumInstance>();
-        return stringRepr(sei->value->to<IR::Constant>(), width);
-    }
-    ::P4::error(ErrorType::ERR_UNSUPPORTED, "%1% unsupported argument expression of type %2%",
-                expression, expression->type->node_type_name());
-    return std::nullopt;
-}
+}  // namespace ControlPlaneAPI
 
-}  // namespace P4::ControlPlaneAPI
+}  // namespace P4
diff --git a/control-plane/bytestrings.h b/control-plane/bytestrings.h
index 33c394485fb..2ebe6b2cbf3 100644
--- a/control-plane/bytestrings.h
+++ b/control-plane/bytestrings.h
@@ -20,44 +20,23 @@ limitations under the License.
 #include <optional>
 #include <string>
 
-#include "lib/big_int.h"
+#include "lib/big_int_util.h"
 
 namespace P4::IR {
 
-class Type;
 class Constant;
 class BoolLiteral;
-class Expression;
 
 }  // namespace P4::IR
 
 namespace P4 {
 
-class TypeMap;
-
 namespace ControlPlaneAPI {
 
-/// getTypeWidth returns the width in bits for the @type, except if it is a
-/// user-defined type with a @p4runtime_translation annotation, in which case it
-/// returns W if the type is bit<W>, and 0 otherwise (i.e. if the type is
-/// string).
-int getTypeWidth(const IR::Type &type, const TypeMap &typeMap);
-
-/// Convert a Constant to the P4Runtime bytes representation by calling
-/// stringReprConstant.
 std::optional<std::string> stringRepr(const IR::Constant *constant, int width);
 
-/// Convert a BoolLiteral to the P4Runtime bytes representation by calling
-/// stringReprConstant.
 std::optional<std::string> stringRepr(const IR::BoolLiteral *constant, int width);
 
-/// Convert an Expression to the P4Runtime bytes representation.
-/// The type map is required to resolve complex expressions such as serializable enums.
-std::optional<std::string> stringRepr(const TypeMap &typeMap, const IR::Expression *expression);
-
-/// Convert a bignum to the P4Runtime bytes representation. The value must fit
-/// within the provided @width expressed in bits. Padding will be added as
-/// necessary (as the most significant bits).
 std::optional<std::string> stringReprConstant(big_int value, int width);
 
 }  // namespace ControlPlaneAPI
diff --git a/control-plane/p4RuntimeSerializer.cpp b/control-plane/p4RuntimeSerializer.cpp
index e6120d824ca..f48b2fc47b2 100644
--- a/control-plane/p4RuntimeSerializer.cpp
+++ b/control-plane/p4RuntimeSerializer.cpp
@@ -30,20 +30,18 @@ limitations under the License.
 #include <utility>
 #include <vector>
 
+#include "lib/error.h"
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wpedantic"
-#include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
 #pragma GCC diagnostic pop
 
+// TODO(antonin): this include should go away when we cleanup getMatchFields
+// and tableNeedsPriority implementations.
 #include "control-plane/bytestrings.h"
 #include "control-plane/flattenHeader.h"
-#include "control-plane/p4RuntimeAnnotations.h"
-#include "control-plane/p4RuntimeArchHandler.h"
-#include "control-plane/p4RuntimeArchStandard.h"
-#include "control-plane/p4RuntimeSymbolTable.h"
-#include "control-plane/typeSpecConverter.h"
 #include "frontends/common/options.h"
 #include "frontends/common/resolveReferences/referenceMap.h"
 #include "frontends/p4/coreLibrary.h"
@@ -57,9 +55,13 @@ limitations under the License.
 #include "frontends/p4/typeChecking/typeChecker.h"
 #include "frontends/p4/typeMap.h"
 #include "ir/ir.h"
-#include "lib/error.h"
 #include "lib/log.h"
 #include "lib/nullstream.h"
+#include "p4RuntimeAnnotations.h"
+#include "p4RuntimeArchHandler.h"
+#include "p4RuntimeArchStandard.h"
+#include "p4RuntimeSymbolTable.h"
+#include "typeSpecConverter.h"
 
 namespace p4v1 = ::p4::v1;
 namespace p4configv1 = ::p4::config::v1;
@@ -165,12 +167,8 @@ static bool writeTextTo(const Message &message, std::ostream *destination) {
 
 /// The information about a default action which is needed to serialize it.
 struct DefaultAction {
-    // The action declaration
-    const IR::P4Action *action;
-    // Is this a const default action?
-    const bool isConst;
-    // The arguments for this action.
-    const IR::Vector<IR::Argument> *arguments;
+    const cstring name;  // The fully qualified external name of this action.
+    const bool isConst;  // Is this a const default action?
 };
 
 /// The information about a match field which is needed to serialize it.
@@ -258,35 +256,25 @@ static std::optional<DefaultAction> getDefaultAction(const IR::P4Table *table, R
                                                      TypeMap *typeMap) {
     // not using getDefaultAction() here as I actually need the property IR node
     // to check if the default action is constant.
-    const auto *defaultActionProperty =
+    auto defaultActionProperty =
         table->properties->getProperty(IR::TableProperties::defaultActionPropertyName);
-    if (defaultActionProperty == nullptr) {
-        ::P4::error(ErrorType::ERR_EXPECTED, "Expected table %1% to have a default action", table);
-        return std::nullopt;
-    }
-
+    if (defaultActionProperty == nullptr) return std::nullopt;
     if (!defaultActionProperty->value->is<IR::ExpressionValue>()) {
         ::P4::error(ErrorType::ERR_EXPECTED, "Expected an action: %1%", defaultActionProperty);
         return std::nullopt;
     }
 
-    const auto *expr = defaultActionProperty->value->to<IR::ExpressionValue>()->expression;
+    auto expr = defaultActionProperty->value->to<IR::ExpressionValue>()->expression;
     cstring actionName;
-    const IR::Vector<IR::Argument> *arguments = nullptr;
-    const IR::P4Action *action = nullptr;
     if (expr->is<IR::PathExpression>()) {
-        const auto *decl = refMap->getDeclaration(expr->to<IR::PathExpression>()->path, true);
-        action = decl->to<IR::P4Action>();
-        BUG_CHECK(action, "Expected an action: %1%", expr);
-        actionName = action->controlPlaneName();
-        arguments = new IR::Vector<IR::Argument>;
+        auto decl = refMap->getDeclaration(expr->to<IR::PathExpression>()->path, true);
+        BUG_CHECK(decl->is<IR::P4Action>(), "Expected an action: %1%", expr);
+        actionName = decl->to<IR::P4Action>()->controlPlaneName();
     } else if (expr->is<IR::MethodCallExpression>()) {
-        const auto *callExpr = expr->to<IR::MethodCallExpression>();
-        auto *instance = MethodInstance::resolve(callExpr, refMap, typeMap);
+        auto callExpr = expr->to<IR::MethodCallExpression>();
+        auto instance = P4::MethodInstance::resolve(callExpr, refMap, typeMap);
         BUG_CHECK(instance->is<P4::ActionCall>(), "Expected an action: %1%", expr);
         actionName = instance->to<P4::ActionCall>()->action->controlPlaneName();
-        action = instance->to<P4::ActionCall>()->action;
-        arguments = callExpr->arguments;
     } else {
         ::P4::error(ErrorType::ERR_UNEXPECTED,
                     "Unexpected expression in default action for table %1%: %2%",
@@ -294,7 +282,7 @@ static std::optional<DefaultAction> getDefaultAction(const IR::P4Table *table, R
         return std::nullopt;
     }
 
-    return DefaultAction{action, defaultActionProperty->isConstant, arguments};
+    return DefaultAction{actionName, defaultActionProperty->isConstant};
 }
 
 /// @return true if @table has a 'const entries' property.
@@ -361,6 +349,22 @@ static std::optional<MatchField::MatchType> getMatchType(cstring matchTypeName)
     }
 }
 
+// getTypeWidth returns the width in bits for the @type, except if it is a
+// user-defined type with a @p4runtime_translation annotation, in which case it
+// returns W if the type is bit<W>, and 0 otherwise (i.e. if the type is
+// string).
+static int getTypeWidth(const IR::Type *type, TypeMap *typeMap) {
+    TranslationAnnotation annotation;
+    if (hasTranslationAnnotation(type, &annotation)) {
+        // W if the type is bit<W>, and 0 if the type is string
+        return annotation.controller_type.width;
+    }
+    /* Treat error type as string */
+    if (type->is<IR::Type_Error>()) return 0;
+
+    return typeMap->widthBits(type, type->getNode(), false);
+}
+
 /// @return the header instance fields matched against by @table's key. The
 /// fields are represented as a (fully qualified field name, match type) tuple.
 static std::vector<MatchField> getMatchFields(const IR::P4Table *table, ReferenceMap *refMap,
@@ -393,7 +397,7 @@ static std::vector<MatchField> getMatchFields(const IR::P4Table *table, Referenc
         // the match field has a user-defined type.
         TypeSpecConverter::convert(refMap, typeMap, matchFieldType, p4RtTypeInfo);
         auto type_name = getTypeName(matchFieldType, typeMap);
-        int width = getTypeWidth(*matchFieldType, *typeMap);
+        int width = getTypeWidth(matchFieldType, typeMap);
         matchFields.push_back(MatchField{*matchFieldName, id, *matchType, matchTypeName,
                                          uint32_t(width), keyElement->to<IR::IAnnotated>(),
                                          type_name});
@@ -577,7 +581,7 @@ class P4RuntimeAnalyzer {
                 continue;
             }
             if (!paramType->is<IR::Type_Enum>()) {
-                int w = getTypeWidth(*paramType, *typeMap);
+                int w = getTypeWidth(paramType, typeMap);
                 param->set_bitwidth(w);
             }
             // We ignore the return type on purpose, but the call is required to update p4RtTypeInfo
@@ -635,7 +639,7 @@ class P4RuntimeAnalyzer {
                       "Header field %1% has a type which is not bit<>, "
                       "int<>, type, or serializable enum",
                       headerField);
-            auto w = getTypeWidth(*fieldType, *typeMap);
+            auto w = getTypeWidth(fieldType, typeMap);
             metadata->set_bitwidth(w);
             // We ignore the return type on purpose, but the call is required to update p4RtTypeInfo
             // if the header field has a user-defined type.
@@ -656,9 +660,6 @@ class P4RuntimeAnalyzer {
 
         auto tableSize = Helpers::getTableSize(tableDeclaration);
         auto defaultAction = getDefaultAction(tableDeclaration, refMap, typeMap);
-        if (!defaultAction.has_value()) {
-            return;
-        }
         auto matchFields =
             getMatchFields(tableDeclaration, refMap, typeMap, p4Info->mutable_type_info());
         auto actions = getActionRefs(tableDeclaration, refMap);
@@ -676,34 +677,11 @@ class P4RuntimeAnalyzer {
                     [this](cstring anno) { return archHandler->filterAnnotations(anno); });
         table->set_size(tableSize);
 
-        auto id = symbols.getId(P4RuntimeSymbolType::P4RT_ACTION(),
-                                defaultAction->action->controlPlaneName());
-
-        if (defaultAction->isConst) {
+        if (defaultAction && defaultAction->isConst) {
+            auto id = symbols.getId(P4RuntimeSymbolType::P4RT_ACTION(), defaultAction->name);
             table->set_const_default_action_id(id);
         }
 
-        table->mutable_initial_default_action()->set_action_id(id);
-        int parameterIndex = 0;
-        int parameterId = 1;
-        for (const auto *argument : *defaultAction->arguments) {
-            auto value = stringRepr(*typeMap, argument->expression);
-            if (!value.has_value()) {
-                continue;
-            }
-            auto *protoParam = table->mutable_initial_default_action()->mutable_arguments()->Add();
-            const auto *parameter =
-                defaultAction->action->parameters->parameters.at(parameterIndex++);
-            const auto *idAnnotation = parameter->getAnnotation("id"_cs);
-            if (idAnnotation != nullptr) {
-                protoParam->set_param_id(idAnnotation->expr[0]->checkedTo<IR::Constant>()->asInt());
-            } else {
-                protoParam->set_param_id(parameterId);
-            }
-            parameterId++;
-            protoParam->set_value(*value);
-        }
-
         for (const auto &action : actions) {
             auto id = symbols.getId(P4RuntimeSymbolType::P4RT_ACTION(), action.name);
             auto action_ref = table->add_action_refs();
@@ -771,7 +749,7 @@ class P4RuntimeAnalyzer {
             // Generate P4Info for any extern functions it may invoke.
             forAllMatching<IR::MethodCallExpression>(
                 action->body, [&](const IR::MethodCallExpression *call) {
-                    auto instance = MethodInstance::resolve(call, refMap, typeMap);
+                    auto instance = P4::MethodInstance::resolve(call, refMap, typeMap);
                     if (instance->is<P4::ExternFunction>()) {
                         archHandler->addExternFunction(symbols, p4Info,
                                                        instance->to<P4::ExternFunction>());
@@ -782,7 +760,7 @@ class P4RuntimeAnalyzer {
         // Generate P4Info for any extern function invoked directly from control.
         forAllMatching<IR::MethodCallExpression>(
             control->body, [&](const IR::MethodCallExpression *call) {
-                auto instance = MethodInstance::resolve(call, refMap, typeMap);
+                auto instance = P4::MethodInstance::resolve(call, refMap, typeMap);
                 if (instance->is<P4::ExternFunction>()) {
                     archHandler->addExternFunction(symbols, p4Info,
                                                    instance->to<P4::ExternFunction>());
@@ -1151,15 +1129,29 @@ class P4RuntimeEntriesConverter {
 
         auto protoAction = protoEntry->mutable_action()->mutable_action();
         protoAction->set_action_id(actionId);
+        int parameterIndex = 0;
         int parameterId = 1;
         for (auto arg : *actionCall->arguments) {
             auto protoParam = protoAction->add_params();
             protoParam->set_param_id(parameterId++);
-            auto value = stringRepr(*typeMap, arg->expression);
-            if (!value.has_value()) {
+            auto parameter = actionDecl->parameters->parameters.at(parameterIndex++);
+            int width = getTypeWidth(parameter->type, typeMap);
+            auto ei = EnumInstance::resolve(arg->expression, typeMap);
+            if (arg->expression->is<IR::Constant>()) {
+                auto value = stringRepr(arg->expression->to<IR::Constant>(), width);
+                protoParam->set_value(*value);
+            } else if (arg->expression->is<IR::BoolLiteral>()) {
+                auto value = stringRepr(arg->expression->to<IR::BoolLiteral>(), width);
+                protoParam->set_value(*value);
+            } else if (ei != nullptr && ei->is<SerEnumInstance>()) {
+                auto sei = ei->to<SerEnumInstance>();
+                auto value = stringRepr(sei->value->to<IR::Constant>(), width);
+                protoParam->set_value(*value);
+            } else {
+                ::P4::error(ErrorType::ERR_UNSUPPORTED, "%1% unsupported argument expression",
+                            arg->expression);
                 continue;
             }
-            protoParam->set_value(*value);
         }
     }
 
@@ -1170,7 +1162,7 @@ class P4RuntimeEntriesConverter {
         int fieldId = 1;
         for (auto k : keyset->components) {
             auto tableKey = table->getKey()->keyElements.at(keyIndex++);
-            auto keyWidth = getTypeWidth(*tableKey->expression->type, *typeMap);
+            auto keyWidth = getTypeWidth(tableKey->expression->type, typeMap);
             auto matchType = getKeyMatchType(tableKey, refMap);
 
             if (matchType == P4CoreLibrary::instance().exactMatch.name) {
diff --git a/frontends/p4/typeMap.cpp b/frontends/p4/typeMap.cpp
index 6fe894eac94..9d0c91bb61a 100644
--- a/frontends/p4/typeMap.cpp
+++ b/frontends/p4/typeMap.cpp
@@ -353,7 +353,7 @@ const IR::Type *TypeMap::getCanonical(const IR::Type *type) {
     return type;
 }
 
-int TypeMap::widthBits(const IR::Type *type, const IR::Node *errorPosition, bool max) const {
+int TypeMap::widthBits(const IR::Type *type, const IR::Node *errorPosition, bool max) {
     CHECK_NULL(type);
     const IR::Type *t;
     if (auto tt = type->to<IR::Type_Type>())
diff --git a/frontends/p4/typeMap.h b/frontends/p4/typeMap.h
index 88d4e64e13c..e0d636b6d30 100644
--- a/frontends/p4/typeMap.h
+++ b/frontends/p4/typeMap.h
@@ -104,7 +104,7 @@ class TypeMap final : public ProgramMap {
     /// The width in bits of this type.  If the width is not
     /// well-defined this will report an error and return -1.
     /// max indicates whether we want the max width or min width.
-    int widthBits(const IR::Type *type, const IR::Node *errorPosition, bool max) const;
+    int widthBits(const IR::Type *type, const IR::Node *errorPosition, bool max);
 
     /// True is type occupies no storage.
     bool typeIsEmpty(const IR::Type *type) const;
diff --git a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
index 94971d563a0..32e70c7db92 100644
--- a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -47,9 +44,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
index 4c76c6b2ef0..102d122c522 100644
--- a/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
index 9bdad5d3968..1693608bd91 100644
--- a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
index 4108cf322f9..16fea8f083b 100644
--- a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
index 0cbbd5f6938..908f12a1cba 100644
--- a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 25652968
   }
   const_default_action_id: 25652968
-  initial_default_action {
-    action_id: 25652968
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
index d40f0a8377b..747112451c2 100644
--- a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
@@ -19,13 +19,6 @@ tables {
   action_refs {
     id: 26966999
   }
-  initial_default_action {
-    action_id: 16865584
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
index 199aca959c4..83a6b066d04 100644
--- a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294074782
   size: 1024
 }
@@ -36,9 +33,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
index 523ba82ca5a..d83ae9ac0f6 100644
--- a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294074782
   size: 1024
 }
@@ -36,9 +33,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
index 46f41893341..80ac7dd7235 100644
--- a/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 289199568
   size: 1024
 }
@@ -36,9 +33,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 285903678
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
index c0662170ebb..097e2ec7760 100644
--- a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 291652621
   size: 1024
 }
@@ -36,9 +33,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 291652621
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
index 07fb9890cb7..e07c4fb0fe3 100644
--- a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
index d193270eb70..29a3be03d2d 100644
--- a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 20728178
   }
   const_default_action_id: 20728178
-  initial_default_action {
-    action_id: 20728178
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
index 6276106d6fc..ddadf42bc63 100644
--- a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
-  initial_default_action {
-    action_id: 29022044
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
index 3973f71eca5..e9a7c87335a 100644
--- a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 25073243
   }
   const_default_action_id: 25073243
-  initial_default_action {
-    action_id: 25073243
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
index 3973f71eca5..e9a7c87335a 100644
--- a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 25073243
   }
   const_default_action_id: 25073243
-  initial_default_action {
-    action_id: 25073243
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
index 0b04e67e062..62774f2d1e8 100644
--- a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
-  initial_default_action {
-    action_id: 32554999
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
index 0b04e67e062..62774f2d1e8 100644
--- a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
-  initial_default_action {
-    action_id: 32554999
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
index 0b04e67e062..62774f2d1e8 100644
--- a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
-  initial_default_action {
-    action_id: 32554999
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
index bed07b33cb1..e8156b06312 100644
--- a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
index fc7a0562067..7033385f7e1 100644
--- a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 65536
 }
 tables {
@@ -58,9 +55,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 131072
 }
 tables {
@@ -92,9 +86,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16384
 }
 tables {
@@ -120,9 +111,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 tables {
@@ -145,9 +133,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 tables {
@@ -173,9 +158,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
index 15090f20fbc..4ed10559c15 100644
--- a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
index 79cc89957c6..eaa0bc5ef6a 100644
--- a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -49,9 +46,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
index d6a77910f69..ce33ebd07b1 100644
--- a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
index 02191f93b14..77cf8912f75 100644
--- a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 30378945
   }
   const_default_action_id: 30378945
-  initial_default_action {
-    action_id: 30378945
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
index a6b825e4bd7..4cfc1acc62a 100644
--- a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
index 775e2680bdd..8adb84a3404 100644
--- a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
index 13b6a278270..3af394a4c07 100644
--- a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     id: 32121835
   }
   const_default_action_id: 32121835
-  initial_default_action {
-    action_id: 32121835
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
index 5290a11db40..5e45df90b2f 100644
--- a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
@@ -29,9 +29,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
index 7785cab3cb7..3f4798bbd96 100644
--- a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
@@ -59,9 +59,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
-  initial_default_action {
-    action_id: 23563653
-  }
   size: 1024
 }
 tables {
@@ -95,9 +92,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -161,9 +155,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
-  initial_default_action {
-    action_id: 23563653
-  }
   size: 1024
 }
 tables {
@@ -238,9 +229,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
-  initial_default_action {
-    action_id: 23563653
-  }
   size: 1024
 }
 tables {
@@ -335,9 +323,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
-  initial_default_action {
-    action_id: 23563653
-  }
   size: 1024
 }
 tables {
@@ -400,9 +385,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -454,9 +436,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21063902
-  initial_default_action {
-    action_id: 21063902
-  }
   size: 1024
 }
 tables {
@@ -520,9 +499,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 20772460
-  initial_default_action {
-    action_id: 20772460
-  }
   size: 1024
 }
 tables {
@@ -758,9 +734,6 @@ tables {
   action_refs {
     id: 26077229
   }
-  initial_default_action {
-    action_id: 29962337
-  }
   direct_resource_ids: 324963620
   size: 1024
 }
@@ -997,9 +970,6 @@ tables {
   action_refs {
     id: 26077229
   }
-  initial_default_action {
-    action_id: 29962337
-  }
   direct_resource_ids: 334749261
   size: 1024
 }
@@ -1236,9 +1206,6 @@ tables {
   action_refs {
     id: 26077229
   }
-  initial_default_action {
-    action_id: 29962337
-  }
   direct_resource_ids: 320450761
   size: 1024
 }
@@ -1332,9 +1299,6 @@ tables {
     id: 18759588
   }
   const_default_action_id: 18759588
-  initial_default_action {
-    action_id: 18759588
-  }
   direct_resource_ids: 331716030
   size: 1024
 }
@@ -1424,9 +1388,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 18759588
-  initial_default_action {
-    action_id: 18759588
-  }
   direct_resource_ids: 334791879
   size: 1024
 }
@@ -1484,9 +1445,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -1722,9 +1680,6 @@ tables {
   action_refs {
     id: 31424218
   }
-  initial_default_action {
-    action_id: 28146588
-  }
   direct_resource_ids: 320981527
   size: 1024
 }
@@ -1961,9 +1916,6 @@ tables {
   action_refs {
     id: 31424218
   }
-  initial_default_action {
-    action_id: 28146588
-  }
   direct_resource_ids: 322865948
   size: 1024
 }
@@ -2200,9 +2152,6 @@ tables {
   action_refs {
     id: 31424218
   }
-  initial_default_action {
-    action_id: 28146588
-  }
   direct_resource_ids: 328370481
   size: 1024
 }
@@ -2265,9 +2214,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -2319,9 +2265,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -2420,9 +2363,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -2492,9 +2432,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -2546,9 +2483,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 321751294
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
index 2fc1eacbd9d..616d9801aaa 100644
--- a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 21913698
   }
-  initial_default_action {
-    action_id: 21913698
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
index 7efe605032f..60ec69e011d 100644
--- a/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
@@ -20,17 +20,6 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
-  initial_default_action {
-    action_id: 29022044
-    arguments {
-      param_id: 1
-      value: "\000\000\000\n"
-    }
-    arguments {
-      param_id: 2
-      value: "\000\000\000\000"
-    }
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
index c1ad560760a..1dce9d362fb 100644
--- a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
@@ -14,13 +14,6 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
-  initial_default_action {
-    action_id: 29022044
-    arguments {
-      param_id: 1
-      value: "\000\000\000\n"
-    }
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
index 31a1da9611b..45005334560 100644
--- a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
@@ -13,13 +13,6 @@ tables {
   action_refs {
     id: 23144899
   }
-  initial_default_action {
-    action_id: 23144899
-    arguments {
-      param_id: 1
-      value: "\000\000\000\n"
-    }
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
index d672decd957..ead32dc500d 100644
--- a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 18759588
   }
   const_default_action_id: 18759588
-  initial_default_action {
-    action_id: 18759588
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
index 82d80cc916b..b06fa2c5d91 100644
--- a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     id: 24266015
   }
   const_default_action_id: 17164167
-  initial_default_action {
-    action_id: 17164167
-  }
   direct_resource_ids: 326221069
   size: 1024
 }
@@ -72,13 +69,6 @@ tables {
     id: 25032921
   }
   const_default_action_id: 25032921
-  initial_default_action {
-    action_id: 25032921
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-  }
   direct_resource_ids: 335473470
   size: 1024
 }
@@ -109,9 +99,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 330959985
   size: 1024
 }
@@ -136,9 +123,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 318961579
   size: 1024
 }
@@ -166,9 +150,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 333425635
   size: 1024
 }
@@ -266,9 +247,6 @@ tables {
     id: 29607214
   }
   const_default_action_id: 29607214
-  initial_default_action {
-    action_id: 29607214
-  }
   direct_resource_ids: 319194241
   size: 1024
 }
@@ -293,9 +271,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 326370320
   size: 1024
 }
@@ -329,9 +304,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 321989420
   size: 1024
 }
@@ -362,9 +334,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   implementation_id: 291115404
   direct_resource_ids: 322798228
   size: 1024
@@ -390,9 +359,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 319194968
   size: 1024
 }
@@ -417,9 +383,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 334575698
   size: 1024
 }
@@ -439,9 +402,6 @@ tables {
     id: 28485346
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -471,9 +431,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   direct_resource_ids: 318892680
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
index 446d6c761ff..7ec1dd5f264 100644
--- a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 33281717
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
index c8cabd596a9..f6f0ac9972e 100644
--- a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16384
 }
 tables {
@@ -68,9 +62,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -94,9 +85,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -111,9 +99,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -137,9 +122,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 256
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
index 3c21a1295d8..09213a032d1 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
index 45153d08c09..9a4f8a1b232 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
index 5fe1c80fdf5..4edd46d542c 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
index 12192fe8819..b46cd7b7a7b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
index 0042ba8ca68..fd308934fa3 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
index fe9a0218b5b..c6991d20a2b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
index d885a15b7c5..672dd7c0270 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
index d230e790962..dc34c0f3e5b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
index b8a40a9449e..14fe5675e29 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -49,9 +46,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
index 0756a671747..da58ddfecb6 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
index ef8d2349795..0387a5ea8fc 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
index 8bf1426336d..439fdd83ac4 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
index 184cb8dee63..167055d8651 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
index 7482116e544..954f9302351 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
index 94f6cd6ef64..6335e986db3 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
index f6b65cfd7a2..d15d7f39246 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
index f671454231b..6dbbb04c2e4 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
index f9016eb27ed..3916da78de4 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
index 207cce7419b..eac31d11dc1 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
index 97e11411570..098a163ce5d 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
index 6679d822388..fe58351d5ae 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
@@ -15,9 +15,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
index 2427fbfd29a..c03ae60e4f1 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
index 0da506e8415..dc15762b635 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
index 0a4c2014757..42972d745ec 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -44,9 +41,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
index fd979d15799..1b7a0ad10b0 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
index 56e04b73347..f2fe672ed8c 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
index 2b455398b15..92557c02569 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
index 0d9c882704e..b4f4b802538 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
index 9d7811dbe7c..dac37ed60b6 100644
--- a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
@@ -21,9 +21,6 @@ tables {
     id: 16785644
   }
   const_default_action_id: 16785644
-  initial_default_action {
-    action_id: 16785644
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
index a9ee45fc368..a4f1a040523 100644
--- a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
index a64eec7a5af..96fcc8aa477 100644
--- a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -58,9 +55,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -88,9 +82,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -118,9 +109,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -148,9 +136,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -178,9 +163,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -208,9 +190,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -238,9 +217,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
@@ -268,9 +244,6 @@ tables {
   action_refs {
     id: 26776898
   }
-  initial_default_action {
-    action_id: 25218163
-  }
   size: 1024
   has_initial_entries: true
 }
diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
index 7bc0b3d1fca..c38b7239725 100644
--- a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
index 0ee9a3ca6a0..b3a73ec34f9 100644
--- a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
@@ -67,9 +67,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
index bf1a47e67eb..071cf165897 100644
--- a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
@@ -43,9 +43,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
index 93ddc6d81ae..024e3a868a1 100644
--- a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -78,9 +72,6 @@ tables {
   action_refs {
     id: 20119496
   }
-  initial_default_action {
-    action_id: 20119496
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
index fc7a0562067..7033385f7e1 100644
--- a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 65536
 }
 tables {
@@ -58,9 +55,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 131072
 }
 tables {
@@ -92,9 +86,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16384
 }
 tables {
@@ -120,9 +111,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 tables {
@@ -145,9 +133,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 tables {
@@ -173,9 +158,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 32768
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
index 26f5ccb803d..ebeb2be7504 100644
--- a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 26265154
   }
   const_default_action_id: 20728178
-  initial_default_action {
-    action_id: 20728178
-  }
   size: 1024
 }
 tables {
@@ -32,9 +29,6 @@ tables {
     id: 26265154
   }
   const_default_action_id: 26265154
-  initial_default_action {
-    action_id: 26265154
-  }
   size: 1024
 }
 tables {
@@ -47,9 +41,6 @@ tables {
     id: 20728178
   }
   const_default_action_id: 20728178
-  initial_default_action {
-    action_id: 20728178
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
index eb602f0e767..fbf612b2228 100644
--- a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 28550627
   }
-  initial_default_action {
-    action_id: 28550627
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
index 8589cd85610..f0dd0f1d5b1 100644
--- a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
@@ -30,9 +30,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
index da343f49732..47aadf9cc67 100644
--- a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
index 84810bb35b5..ab1dfb29a54 100644
--- a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -74,9 +68,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
index b92c8fe023f..3e9d6e3d9de 100644
--- a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
index 57fa8975527..025e575aa86 100644
--- a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 3
 }
 tables {
@@ -34,9 +31,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 10
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
index f53c8ed84d4..e16e05a8794 100644
--- a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
index f53c8ed84d4..e16e05a8794 100644
--- a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
index f53c8ed84d4..e16e05a8794 100644
--- a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
index f53c8ed84d4..e16e05a8794 100644
--- a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
index cffa1ea96c5..24f6e3908e5 100644
--- a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 8
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 8
 }
 tables {
@@ -83,9 +77,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
index d9b17a47ea3..66c34ab5c58 100644
--- a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
index 30318020b80..89e1868e4d8 100644
--- a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
index 87d64e24d72..149090280c1 100644
--- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
@@ -30,9 +30,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
index 264bf8e35a4..3c7887c18bf 100644
--- a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 27086398
   }
   const_default_action_id: 25451019
-  initial_default_action {
-    action_id: 25451019
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
index 0ea3b17c199..b77a01f32e9 100644
--- a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -52,9 +49,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
index 2886f213a71..07fc30ea424 100644
--- a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 64
 }
 tables {
@@ -57,9 +54,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 64
 }
 tables {
@@ -80,9 +74,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 64
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
index d6a77910f69..ce33ebd07b1 100644
--- a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
index a883847cf09..405b5ac2936 100644
--- a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
index 889ec1e72d5..086bb9baf1a 100644
--- a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
index 8dc206b4db1..045f5ad9615 100644
--- a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
@@ -20,9 +20,6 @@ tables {
     id: 23080345
   }
   const_default_action_id: 23080345
-  initial_default_action {
-    action_id: 23080345
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
index e7382debb82..bc9fdb13c70 100644
--- a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
index db2c93712ae..03c5a037a37 100644
--- a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
index 0396a9e8ece..7808e055bf0 100644
--- a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
index f3a18114ac3..4f0834a91c8 100644
--- a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
index cebbd76eeb4..d13d4bb0b2d 100644
--- a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
index e09d9e901c7..2f5bb2b992f 100644
--- a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 30461719
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
index e09d9e901c7..2f5bb2b992f 100644
--- a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 30461719
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
index 66bd76c53eb..2418089ad0d 100644
--- a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
@@ -21,9 +21,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
index acef4f91209..78f6118a1b3 100644
--- a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
index 8f4c6b50dc0..dd754263575 100644
--- a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
@@ -39,9 +39,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
index 3fe60b6b0f1..ff39c1978ec 100644
--- a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
@@ -29,9 +29,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
index 0addefe832a..9b93fad2579 100644
--- a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
index 0070ceb9a07..7dd4621a878 100644
--- a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
@@ -21,9 +21,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -43,9 +40,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
index 57e69844dad..c82b49a7071 100644
--- a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
index 10ba1a0afe4..e1f5aece048 100644
--- a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
@@ -15,9 +15,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
index f564d957b5f..9b46cec4465 100644
--- a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
index 83eed5d825c..a1660a74f90 100644
--- a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
 }
diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
index 4fdcb3bed12..daa752d32bc 100644
--- a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 289199568
   size: 1024
 }
@@ -36,9 +33,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
index 2e1c1ee6545..bd032289690 100644
--- a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 28773984
   }
-  initial_default_action {
-    action_id: 28773984
-  }
   size: 8
 }
 tables {
@@ -36,9 +33,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 2
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
index 871fbf9098f..92b3135ef87 100644
--- a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
@@ -20,9 +20,6 @@ tables {
     id: 18712486
   }
   const_default_action_id: 18712486
-  initial_default_action {
-    action_id: 18712486
-  }
   size: 1000000
 }
 tables {
@@ -41,9 +38,6 @@ tables {
     id: 32723879
   }
   const_default_action_id: 32723879
-  initial_default_action {
-    action_id: 32723879
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
index f4b43beba49..52820be944a 100644
--- a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
index 90214ed996d..f9f65d27610 100644
--- a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
@@ -30,13 +30,6 @@ tables {
     annotations: "@defaut_only"
   }
   const_default_action_id: 18870058
-  initial_default_action {
-    action_id: 18870058
-    arguments {
-      param_id: 1
-      value: "\000\002"
-    }
-  }
   size: 1024
 }
 tables {
@@ -59,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -84,9 +74,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
index 4d228a233b4..864b97a3c87 100644
--- a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
@@ -30,9 +30,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -80,9 +74,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
index 1ad6a7ef6b8..b3cf3e31341 100644
--- a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
@@ -58,9 +58,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -101,9 +98,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
index d7aed5ce8e0..5b7beb2db3b 100644
--- a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
@@ -14,13 +14,6 @@ tables {
     id: 32530319
   }
   const_default_action_id: 32530319
-  initial_default_action {
-    action_id: 32530319
-    arguments {
-      param_id: 1
-      value: "\000\000"
-    }
-  }
   direct_resource_ids: 330698586
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
index e180094dfbf..f77a28f00ad 100644
--- a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
@@ -30,9 +30,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
index e4a66262630..ae22de48280 100644
--- a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
index ad665b2242f..4fd7500740f 100644
--- a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
@@ -16,9 +16,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
index c0531ab84a6..cbfa0ac99fa 100644
--- a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
@@ -16,9 +16,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
index 1a39f517bde..83ac102dd90 100644
--- a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 20279829
   }
-  initial_default_action {
-    action_id: 20279829
-  }
   direct_resource_ids: 323801931
   size: 1024
 }
@@ -46,9 +43,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -69,9 +63,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
index 5b8235110ce..50f6a8d4acf 100644
--- a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
@@ -37,9 +37,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
index e4a66262630..ae22de48280 100644
--- a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
index 8f22c165f1b..8c8387495fb 100644
--- a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
index 8f22c165f1b..8c8387495fb 100644
--- a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
index 8f22c165f1b..8c8387495fb 100644
--- a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
index 122c9f33eac..a71d778d8b8 100644
--- a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
@@ -44,9 +44,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
index 40709797cbd..1a88daa3980 100644
--- a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
index 122c9f33eac..a71d778d8b8 100644
--- a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
@@ -44,9 +44,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
index 40709797cbd..1a88daa3980 100644
--- a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
@@ -32,9 +32,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
index c28e6ae9121..310a9d0dec0 100644
--- a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -68,9 +62,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
index 72877387113..15fcacbb4e9 100644
--- a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
index 3044596a2bf..bb9aa73dd5c 100644
--- a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
@@ -91,9 +91,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
index 2ab0b915fdb..ce5f08ab7a6 100644
--- a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -27,9 +24,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
index 08e34cd070c..8f364ae7217 100644
--- a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
index a9ee45fc368..a4f1a040523 100644
--- a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
index 0d9c882704e..b4f4b802538 100644
--- a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
index 0d9c882704e..b4f4b802538 100644
--- a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
index d72bed92c9e..4a19a73f522 100644
--- a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
index 1c5e80eab6a..2a43c9dbbd8 100644
--- a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
@@ -28,13 +28,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 18876683
-    arguments {
-      param_id: 1
-      value: "\000\000\000\000"
-    }
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
index ad33c5e8b0c..8846805c4eb 100644
--- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
@@ -16,13 +16,6 @@ tables {
   action_refs {
     id: 29027610
   }
-  initial_default_action {
-    action_id: 20013177
-    arguments {
-      param_id: 1
-      value: "\000\000\000\003"
-    }
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
index 25d7da9a25d..7c191c13e2a 100644
--- a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
index cceeadb1fb0..541eb7cfc51 100644
--- a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
index a6abfdbcd3d..7774c0a1bd5 100644
--- a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
index eb21c0eabd8..70cda0e2a85 100644
--- a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1
 }
 tables {
@@ -46,9 +43,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -74,9 +68,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -102,9 +93,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 256
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
index 398c9670544..885acc8c7c8 100644
--- a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 368209065
   size: 16384
 }
diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
index 30a57fc6528..3d63970c4a3 100644
--- a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 354402025
   size: 16384
 }
diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
index 1ffb865d7dd..070d1468b0a 100644
--- a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
index 1ffb865d7dd..070d1468b0a 100644
--- a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
index 1ffb865d7dd..070d1468b0a 100644
--- a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
index 265b3f38eef..fbab1a0a231 100644
--- a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 24698652
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 24698652
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -68,9 +62,6 @@ tables {
   action_refs {
     id: 24698652
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -91,9 +82,6 @@ tables {
   action_refs {
     id: 24698652
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -114,9 +102,6 @@ tables {
   action_refs {
     id: 24698652
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
index ba24742db5e..89bc7eaf0e5 100644
--- a/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -40,21 +37,6 @@ tables {
     id: 26090030
   }
   const_default_action_id: 26090030
-  initial_default_action {
-    action_id: 26090030
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-    arguments {
-      param_id: 2
-      value: "\000"
-    }
-    arguments {
-      param_id: 3
-      value: "\000"
-    }
-  }
   size: 1024
 }
 tables {
@@ -87,9 +69,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
-  initial_default_action {
-    action_id: 28401267
-  }
   size: 1024
 }
 tables {
@@ -119,9 +98,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
-  initial_default_action {
-    action_id: 28401267
-  }
   size: 1024
 }
 tables {
@@ -154,9 +130,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
-  initial_default_action {
-    action_id: 28401267
-  }
   size: 1024
 }
 tables {
@@ -189,9 +162,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
-  initial_default_action {
-    action_id: 28401267
-  }
   size: 1024
 }
 tables {
@@ -228,13 +198,6 @@ tables {
     id: 23010411
   }
   const_default_action_id: 23010411
-  initial_default_action {
-    action_id: 23010411
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-  }
   size: 1024
 }
 tables {
@@ -257,9 +220,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -282,9 +242,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 297808402
   size: 1024
 }
@@ -370,9 +327,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 325583051
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
index c0b80bcaa87..5dca49d1870 100644
--- a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
@@ -124,9 +124,6 @@ tables {
   action_refs {
     id: 21580947
   }
-  initial_default_action {
-    action_id: 21580947
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
index d9d468738dd..fe1faf07f47 100644
--- a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
index e4a66262630..ae22de48280 100644
--- a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 25131402
   }
-  initial_default_action {
-    action_id: 25131402
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
index 1c1bd35a300..5dee71f377b 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 126
 }
 tables {
@@ -66,9 +63,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1
 }
 tables {
@@ -168,9 +162,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767361
   size: 254
 }
@@ -207,9 +198,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 64
 }
 tables {
@@ -234,9 +222,6 @@ tables {
     annotations: "@proto_id(1)"
   }
   const_default_action_id: 24742814
-  initial_default_action {
-    action_id: 24742814
-  }
   size: 64
 }
 tables {
@@ -288,9 +273,6 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
-  initial_default_action {
-    action_id: 16777222
-  }
   size: 131072
 }
 tables {
@@ -342,9 +324,6 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
-  initial_default_action {
-    action_id: 16777222
-  }
   size: 17000
 }
 tables {
@@ -380,9 +359,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1600
 }
 tables {
@@ -418,9 +394,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1600
 }
 tables {
@@ -600,9 +573,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767362
   direct_resource_ids: 352321792
   size: 255
@@ -724,9 +694,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767367
   direct_resource_ids: 352321794
   size: 511
@@ -786,9 +753,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767369
   size: 255
 }
@@ -826,9 +790,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -861,9 +822,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 256
 }
 tables {
@@ -904,9 +862,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -935,9 +890,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 2048
 }
 tables {
@@ -967,9 +919,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 299650760
   size: 3968
 }
@@ -1003,9 +952,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 4
 }
 tables {
@@ -1047,9 +993,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -1085,9 +1028,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 110
 }
 tables {
@@ -1168,9 +1108,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767364
   size: 127
 }
diff --git a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
index 63827bfced6..a874de55c50 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
@@ -38,9 +38,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 126
 }
 tables {
@@ -66,9 +63,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1
 }
 tables {
@@ -160,9 +154,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767361
   size: 254
 }
@@ -199,9 +190,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 64
 }
 tables {
@@ -226,9 +214,6 @@ tables {
     annotations: "@proto_id(1)"
   }
   const_default_action_id: 24742814
-  initial_default_action {
-    action_id: 24742814
-  }
   size: 64
 }
 tables {
@@ -280,9 +265,6 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
-  initial_default_action {
-    action_id: 16777222
-  }
   size: 131072
 }
 tables {
@@ -334,9 +316,6 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
-  initial_default_action {
-    action_id: 16777222
-  }
   size: 17000
 }
 tables {
@@ -372,9 +351,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1600
 }
 tables {
@@ -410,9 +386,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1600
 }
 tables {
@@ -576,9 +549,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767362
   direct_resource_ids: 352321792
   size: 255
@@ -669,9 +639,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 255
 }
 tables {
@@ -754,9 +721,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767370
   size: 255
 }
@@ -794,9 +758,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -829,9 +790,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 256
 }
 tables {
@@ -872,9 +830,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -903,9 +858,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 2048
 }
 tables {
@@ -935,9 +887,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 299650760
   size: 3968
 }
@@ -971,9 +920,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 4
 }
 tables {
@@ -1015,9 +961,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -1053,9 +996,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 110
 }
 tables {
@@ -1123,9 +1063,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767364
   size: 127
 }
diff --git a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
index d96a3b482f4..cccb2bd1c28 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
@@ -65,9 +65,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 318767363
   direct_resource_ids: 352321793
   size: 8
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
index c723ce74b49..a86dbc7c757 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
index 3199659d2af..960fa335b31 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -52,9 +49,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
index 9180233b7f5..2064dc01292 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -46,9 +43,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
index da28f349119..b81118f47ff 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
index da28f349119..b81118f47ff 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
index 05c285e6a6c..e7789178f0b 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
index 217b1a61e63..6f30891066a 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
@@ -40,9 +37,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
index de2185fdbc6..b9d5a175e0f 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 28661769
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
@@ -40,9 +37,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -54,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
index 7c83d385d42..0ed6e61f2df 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 28661769
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
@@ -52,9 +49,6 @@ tables {
   action_refs {
     id: 28661769
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -67,9 +61,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -81,9 +72,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
index d94f2103aa1..d7d77b34cea 100644
--- a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 17064084
   }
-  initial_default_action {
-    action_id: 17064084
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
index 83cb287cb4f..d75ec35b4b7 100644
--- a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 22078320
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
index 650c37a0fd7..fd7c56f2b61 100644
--- a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 22078320
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
index cad6ce583a1..8d86d076601 100644
--- a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 22078320
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
index 6054071343f..952cc49eedc 100644
--- a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 319980461
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
index c8bf5bbdfcd..e1b0f5fadb3 100644
--- a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 22078320
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
index 81a2daffd1c..09088e7de68 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
index 43f28f44ca0..023eccf53fe 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 25756908
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
index 43f28f44ca0..023eccf53fe 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 25756908
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
index 184a3258e59..625352189b8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
-  initial_default_action {
-    action_id: 33281717
-  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
index f100bbad25f..7f1b884aadb 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
-  initial_default_action {
-    action_id: 33281717
-  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
index 81a2daffd1c..09088e7de68 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
index 43f28f44ca0..023eccf53fe 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 25756908
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
index 6fe7a7cf614..0b83ddc89a2 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
index 6fe7a7cf614..0b83ddc89a2 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
index d26cd56e56f..a04e3806dfb 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
index 5f576ce84dd..7420b70cf80 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
index 43416054c88..f0ee79747a8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
index e2498ffb34d..670e570b20b 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
index bb39cf44a6a..475d27e1e73 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
@@ -17,17 +17,6 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
-  initial_default_action {
-    action_id: 20013177
-    arguments {
-      param_id: 1
-      value: "\000\000\000\001"
-    }
-    arguments {
-      param_id: 2
-      value: "\000\000\000\002"
-    }
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
index 8725084d5a9..0daf777cb88 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
@@ -16,17 +16,6 @@ tables {
   action_refs {
     id: 29027610
   }
-  initial_default_action {
-    action_id: 20013177
-    arguments {
-      param_id: 1
-      value: "\000\000\000\001"
-    }
-    arguments {
-      param_id: 2
-      value: "\000\000\000\002"
-    }
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
index fdf219b16ea..441125e182b 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
@@ -17,9 +17,6 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
-  initial_default_action {
-    action_id: 20013177
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
index eca7342ab41..13e5c55ff81 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
@@ -16,9 +16,6 @@ tables {
   action_refs {
     id: 29027610
   }
-  initial_default_action {
-    action_id: 20013177
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
index 47b82b25f60..43bddf7c1b3 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
@@ -20,9 +20,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
index b89a8069823..f192d8515f8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
index b89a8069823..f192d8515f8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
index ad33c5e8b0c..8846805c4eb 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
@@ -16,13 +16,6 @@ tables {
   action_refs {
     id: 29027610
   }
-  initial_default_action {
-    action_id: 20013177
-    arguments {
-      param_id: 1
-      value: "\000\000\000\003"
-    }
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
index f82d8cb9465..82a9d5531d3 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
@@ -17,17 +17,6 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
-  initial_default_action {
-    action_id: 20013177
-    arguments {
-      param_id: 1
-      value: "\000\000\000\001"
-    }
-    arguments {
-      param_id: 2
-      value: "\000"
-    }
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
index 81a2daffd1c..09088e7de68 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
@@ -18,9 +18,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
index d5431fb0ad9..345ec80604b 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
index 3d3496bceb1..fb0d08432a7 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
@@ -37,9 +37,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -75,9 +72,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -89,9 +83,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
index 14c1af2274d..8ee44cc3c11 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
@@ -37,9 +37,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -65,9 +59,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
index f6ae1f58d37..4178a2c7ebc 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
@@ -40,9 +40,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
index 04ac91d27dd..748bb905ef7 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
@@ -40,9 +40,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
index 43416054c88..f0ee79747a8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
index e8ed6be661f..4f465726169 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
index ca28450d720..194188737ae 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17082815
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
index 513edb7efe0..ef53980e224 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
index 6e335c05517..151cad032af 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
index fb7f4486469..2cbdf65dee8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
index f5a8bbd9de7..6d2a2368c01 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
index 23f31f4d382..ca16113e5c6 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
@@ -64,9 +64,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
index 025c0b5bec2..23416c7c00e 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
@@ -40,9 +40,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
index 7b101056e17..dcdf86beca4 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -59,9 +53,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
index 97dbb782cd3..451e8cdda37 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
@@ -70,9 +70,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
index 240482df0cb..4cb050950c6 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
@@ -40,9 +40,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
index ce78d137f5f..991c4258c87 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
index 6493d525582..b3b736dc129 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
index 6493d525582..b3b736dc129 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
index 85ad51c596c..ff148623905 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
index 6493d525582..b3b736dc129 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
index 6493d525582..b3b736dc129 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
index 753f06aea5f..e09bbd5fd24 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
index 1466f96cf61..df3e94091b8 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
-  initial_default_action {
-    action_id: 33281717
-  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
index 170b719ba47..b2b2ebe63c4 100644
--- a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 25648360
   }
-  initial_default_action {
-    action_id: 25648360
-  }
   direct_resource_ids: 332805598
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
index 665e268f377..4062f6e4d31 100644
--- a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 26564927
   }
-  initial_default_action {
-    action_id: 26564927
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -71,9 +65,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
index 6fe0bcb5abb..ad34f0d5599 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
index 4c5e44dbf6c..77222614921 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
index eb5991b882a..1724d0a1d4e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
@@ -34,9 +34,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
index 16d219ea349..0c406d853b7 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 18579058
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
index bd87741eb00..505b55555b1 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
index 40a5c471c8d..56dae4ad817 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
index 44545b327f7..c4b75a7c0a4 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
index 06ab4c05a74..c79b9282c89 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
index 6668b1b57db..aec60b621d7 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -46,9 +43,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
index 4c5e44dbf6c..77222614921 100644
--- a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
index d433db4d248..0da67b1427e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
index 6f9e14f84a2..84b170de324 100644
--- a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
index 1cdb547647c..c8318f04900 100644
--- a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
index 4e0ff220a3c..4d8217e326e 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 29480552
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
index 6288bc21f4f..39765ee4796 100644
--- a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
index 0d6ab4949eb..28172e0b6fd 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
index 0d6ab4949eb..28172e0b6fd 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
index 62f25822e31..1bac5d60713 100644
--- a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21832421
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
index 11acc71332c..f49cf68d40c 100644
--- a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
index 9effd68d4df..3aa21217e0c 100644
--- a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   idle_timeout_behavior: NOTIFY_CONTROL
 }
@@ -52,9 +49,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -78,9 +72,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
index 189f18323a9..65e4717c1fb 100644
--- a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
index 2743b14840a..ed9d74c242c 100644
--- a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 22078320
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
index 824e35c60f8..b96cb9212b7 100644
--- a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
index 803e5413ed7..ac49d6ee797 100644
--- a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
index 803e5413ed7..ac49d6ee797 100644
--- a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
index ddf12f95d83..314edf21bb5 100644
--- a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 18493089
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
index ff26c700be8..3d7cd41ac85 100644
--- a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
@@ -13,9 +13,6 @@ tables {
   action_refs {
     id: 25218586
   }
-  initial_default_action {
-    action_id: 25218586
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
index 9a643f5dbe0..439bfee0bde 100644
--- a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 23115527
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
index 9a643f5dbe0..439bfee0bde 100644
--- a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 23115527
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
index e5668c48cd1..0b8fdf17d58 100644
--- a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 23115527
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
index c196d5d9fcb..3d9852d8302 100644
--- a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21620615
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
index 77000ea616d..7803495564f 100644
--- a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 29027610
   }
   const_default_action_id: 29027610
-  initial_default_action {
-    action_id: 29027610
-  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
index 7b101056e17..dcdf86beca4 100644
--- a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -59,9 +53,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
index ebd66b5024a..d20ace0ae39 100644
--- a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21620615
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
index 8cc14ddebb3..c31e25dffa7 100644
--- a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
index 3832a089452..51220445cf2 100644
--- a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
index a33dce39f0d..089dd093472 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
index 7c3aa3b3d3e..37a50337c7f 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
index f398c960407..82d5e1bcea7 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
index b66ce6c3ca1..4e5eebfd067 100644
--- a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
index 5df3458c926..5df64c64875 100644
--- a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 33281717
   }
-  initial_default_action {
-    action_id: 33281717
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
index aaab2091ed9..1cb229f9da2 100644
--- a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
@@ -49,9 +49,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
index f7ff739f41f..564f0106992 100644
--- a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 30218393
   }
   const_default_action_id: 30218393
-  initial_default_action {
-    action_id: 30218393
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
index 413520298e3..b48fd73166a 100644
--- a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
@@ -14,9 +14,6 @@ tables {
     id: 29666769
   }
   const_default_action_id: 29666769
-  initial_default_action {
-    action_id: 29666769
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
index 63badc4011d..caa9c6b17b5 100644
--- a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
index d8ad68e8a28..7c8f03dc221 100644
--- a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
@@ -35,9 +35,6 @@ tables {
     id: 19874155
   }
   const_default_action_id: 25451019
-  initial_default_action {
-    action_id: 25451019
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
index e20b804aabb..c6640a95c50 100644
--- a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
@@ -26,9 +26,6 @@ tables {
     id: 32959729
   }
   const_default_action_id: 25451019
-  initial_default_action {
-    action_id: 25451019
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
index e98eef4c7fe..9a23f101f32 100644
--- a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
@@ -78,9 +78,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
index 0ac84aaf112..ecb1485917c 100644
--- a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
index 55bfaefb129..99083cba15a 100644
--- a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
index 9bdad5d3968..1693608bd91 100644
--- a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
index 4108cf322f9..16fea8f083b 100644
--- a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
index f5b6d8d7a8d..654c254029a 100644
--- a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
index cc955db21f5..14f99e39995 100644
--- a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
index 2ad292b650e..a57bdd471fe 100644
--- a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
@@ -29,9 +29,6 @@ tables {
     id: 17165658
   }
   const_default_action_id: 21186165
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
index f5b6d8d7a8d..654c254029a 100644
--- a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
index 536a1edc827..ca0b6b5a5ad 100644
--- a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 17165658
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
index edeeb6eb0ef..31fb3a2a65e 100644
--- a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
@@ -24,9 +24,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
index be46d587722..6b38e3a88ea 100644
--- a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 27489497
   }
-  initial_default_action {
-    action_id: 27489497
-  }
   size: 1024
 }
 tables {
@@ -54,9 +51,6 @@ tables {
   action_refs {
     id: 27489497
   }
-  initial_default_action {
-    action_id: 27489497
-  }
   size: 1024
 }
 tables {
@@ -77,9 +71,6 @@ tables {
   action_refs {
     id: 27489497
   }
-  initial_default_action {
-    action_id: 27489497
-  }
   size: 1024
 }
 tables {
@@ -100,9 +91,6 @@ tables {
   action_refs {
     id: 27489497
   }
-  initial_default_action {
-    action_id: 27489497
-  }
   size: 1024
 }
 tables {
@@ -123,9 +111,6 @@ tables {
   action_refs {
     id: 27489497
   }
-  initial_default_action {
-    action_id: 27489497
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
index 570ab4d0bc8..8588efe5e00 100644
--- a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
index eea1ef198c6..20348e1c0a8 100644
--- a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
@@ -19,9 +19,6 @@ tables {
   action_refs {
     id: 21186165
   }
-  initial_default_action {
-    action_id: 21186165
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
index d7aed5ce8e0..5b7beb2db3b 100644
--- a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
@@ -14,13 +14,6 @@ tables {
     id: 32530319
   }
   const_default_action_id: 32530319
-  initial_default_action {
-    action_id: 32530319
-    arguments {
-      param_id: 1
-      value: "\000\000"
-    }
-  }
   direct_resource_ids: 330698586
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
index fb6160b6512..1d875662069 100644
--- a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 32254556
   }
-  initial_default_action {
-    action_id: 32254556
-  }
   size: 1024
 }
 tables {
@@ -45,9 +42,6 @@ tables {
   action_refs {
     id: 32254556
   }
-  initial_default_action {
-    action_id: 32254556
-  }
   size: 1024
 }
 tables {
@@ -68,9 +62,6 @@ tables {
   action_refs {
     id: 27859478
   }
-  initial_default_action {
-    action_id: 27859478
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
index 874a938ec03..be3e316af74 100644
--- a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
@@ -23,9 +23,6 @@ tables {
     id: 28447573
   }
   const_default_action_id: 30352513
-  initial_default_action {
-    action_id: 30352513
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
index f38263d436e..809e574c4c0 100644
--- a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -51,9 +48,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -74,9 +68,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
index 1a89cfe410b..f10ad8453e2 100644
--- a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
@@ -28,9 +28,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -57,9 +54,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -80,9 +74,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
index e6fb07d2c32..a5570779506 100644
--- a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
@@ -238,9 +238,6 @@ tables {
   action_refs {
     id: 21580947
   }
-  initial_default_action {
-    action_id: 21580947
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
index e6fb07d2c32..a5570779506 100644
--- a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
@@ -238,9 +238,6 @@ tables {
   action_refs {
     id: 21580947
   }
-  initial_default_action {
-    action_id: 21580947
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
index 93acd7a0875..23eac0411d1 100644
--- a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -54,9 +51,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 tables {
@@ -85,9 +79,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -114,9 +105,6 @@ tables {
   action_refs {
     id: 32609675
   }
-  initial_default_action {
-    action_id: 32609675
-  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
index 0a66de9e3bf..5e34fe562f0 100644
--- a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -86,9 +83,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 actions {