Fixed on trunk via check-in [40def75096].