fa4b0b31c0
This reverts commit 5fca35de0de8da24b8a046616404e74ecb4547b4. PR Close #42521
This reverts commit 5fca35de0de8da24b8a046616404e74ecb4547b4. PR Close #42521