Fixed on trunk via check-in [2322894eb8c65456].