Fix what appears to be a git-merge smashed file (static function duplicated,
file clearly different than what is in 10-stable).