Revert "Further fix for roster_update"

This reverts commit f14493d95c17a0e4522031705399422c33f296bc.