Got rid of changes that aren't going to make it into 2.6.9.