This reverts commit eec5aa627ac34908307bea6849893176cfe6388b GitOrigin-RevId: b83c8c544a6f9d3eefce05f87a3a582cfbbcd22f