This reverts commit 2da493c6023b362ced197b0533fa684c654a3827. GitOrigin-RevId: b11dfff5cce1070c6b8113dc0988fae9ade0d39b