r10314: Apply the controvertial 'server role =' patch after discussion on the list: