This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad. GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8