Remove hard dependency on rest_client