Fixed on trunk via check-in [ad79758d0c].