Pull up r24525 to the 1.9 branch to make "make check" stop failing.