Revert "bonjour"

This reverts commit 5c6431b99a513561d34abb808cfce15b81949ff2.
Revert "Revert "bonjour""

This reverts commit bf0999e4b94d39b5e437770534bf3f1439aabfe2.