Revert r241570, it caused PR24053