Fix -Werror build after r213945