Change the variable name back to conn_enc here to minimize the diff