Nherment/revert fix for multiple presence messages