This fixes a regresssion in 2.6.25 ... presumably it's a better fix than the hack I came up with. I think this regression should be fixed before 2.6.25-final freezes.