This reverts commit 9c64e5ec86a54dce701033c805f442ee7e45b419. GitOrigin-RevId: 6e7024d0740790d35fa649b83ffd3591ac67919f