Don't bring in r24295 into /trunk since it's going to have it's own different patch.