US3 [REBASE] - temp remove US2

(cherry picked from commit b3227dfce17fb01790e091e46d5965803f96f11c)