Fixed #21420 once more.