Preemptively backport the relevant parts of r65420
2 files changed