Backport #25019 by @lunny Caused by #24362 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: John Olheiser <john.olheiser@gmail.com> (cherry picked from commit 73ae6b21d1b993e9936224b79b0bc743dbf382fc)