Fixed on trunk by check-in [8d0c39afd2].