Fixed on trunk via check-in [9c43b0b95c].