This reverts commit 1882451ec03daeebe32f2355030faf7e2f90ae8a. Reason: breaks some g3 targets. PR Close #35973