Revert r257055, it caused PR26064.