This reverts commit 4617b9ec2ed63b14418a8510a214e58397314831. GitOrigin-RevId: abb3f94c50b94cd87012d9e55c40afd9cbfe97e0