Make backport trunk c81fb53 compile.