Fixed by check-in [1d280a85aa]