This reverts commit 5b9191bce2fe1de85c573ed533521e53f08d146b. GitOrigin-RevId: 80bb46f92f200f48fc39138afb27df729959888c