Included in 2.6.9-rc1