This reverts commit f77589eebb91dee370ae32ef129366ad600865c9. GitOrigin-RevId: 36c6786af3a9fc3b995ef03e31185fddb296675c