One moment it works, the next it doesn't.  Forget it - reverting.
Revert "Let's try this again - avahi cleanup attempt #3"

This reverts commit d8f500bffd0c341503e9ef984808220558c6a8be.