(which can be cherry-picked into 1.9.x)