Fixed on trunk via check-in [cfc40dbb9c80f1cf].