Re-added avahi