A fix from the last commit for bug #8369.