Reverted broken change to server messages