This reverts commit 3ef46af6363aab5b5b007b6c9d72decae65a36ab. GitOrigin-RevId: 9c3671b3ff196bb62ff547210a1138cb603d6791