Fix build on stable/9.

I am sorry. :(
[automated] Merge in upstream-github/stable/9