conn_map: update according to upstream PR.