remove the changes here, they need their own PR. Specially after ignores the server configuration.