From 548e8853e65ee581472024dd02b5e310b7f7a60e Mon Sep 17 00:00:00 2001
From: Casey Hillers <chillers@google.com>
Date: Wed, 6 Apr 2022 18:19:59 -0700
Subject: [PATCH] [Cherrypick] Partial revert of super params in tools
 (#101436) (#101451)

Co-authored-by: Michael Goderbauer <goderbauer@google.com>