Fix the regression pointed out by Robin in r105855.