r13548: Always use the get_remote_macinhe_name() as the key