Fixed on trunk via check-in [f7cac79346].