Fixed presencestate changes lost in previous merge