This obviates all our patches.

PiperOrigin-RevId: 689506991
Change-Id: I245a5e9ad5e1a5f31223fe5c36c8d5b95d5738cc