Backport #35797 by @wxiaoguang Regression of #34973 Fix #35796 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>