Fixed on trunk via check-in [a509add902].