We need to have another go at #18915 without causing the problems described in #20343 again.
We need to have another go at #18915 without causing the problems described in #20343 again.