Back out r259912 - it shouldn't have been committed to this branch.
[automated] Merge in upstream-github/stable/9