Fixed on trunk via check-in [45cc5a21fa].