32489c7426
This reverts commit 84d24c08e1cd5ff3cb28e079ef03a347abf6d98b. PR Close #34910
This reverts commit 84d24c08e1cd5ff3cb28e079ef03a347abf6d98b. PR Close #34910