Fix a regression in 2.6.23. Candidate for -stable IMO.