Fix #206478
[Finishes 58618312]