• Backport of #35822

Comment From: sbrannen

Superseded by issue created by the backport bot after the fact.

  • 35831