refactor: use a more straightforward return value (backport #23718)

refactor: use a more straightforward return value (backport #23718) #36759