Fixed on trunk via check-in [650344341e].