Roll back r96959 again.