Some changes were lost in the merge commit of #66091