Revert "Improvements to presence stanza detection"

This reverts commit 48377b75b37653d6071e389683aa24698877ef51.
Fix presence stanza detection