Stop discriminating against server modes