Revert "Clean up strange buddy notification logic"

This reverts commit 49f4a217d37a937528b914640eb03816aa8cd9c6.
Tweaks