Fixed by check-in [141c31792b]