This patch was needed to pass the buf breakage check for the proto file removed in #7121, but now that master contains the change we no longer need the patch.