This reverts commit 1882451ec0. Reason: breaks some g3 targets. PR Close #35973
1882451ec0
Close #34581 PR Close #34610
PR Close #30962