This reverts commit d0ffcb9a13e9597cebf95961c0c50ef8f950dd7a. GitOrigin-RevId: 46c52ee8df8de4028b3262cb0f3202118014814c