Commented self presence handling #151
Revert "Commented self presence handling #151"

This reverts commit 872726c5aa2bad5ff9f49fa7b8d0a55f6603cb26.
Merge remote-tracking branch 'upstream/master'