This reverts commit dd77915a25fdbbd9c015729ebcbf3806642ac197. GitOrigin-RevId: dc287509f0cdb0be79caf90add1774289dd76124