Fixed on trunk via check-in [5b282efc5f].