Created by: wzzju

As the title, this pr is used to fix #24601.

This pr is equivalent to revert #PR22839.