Not sure how this $SERVICE_NAME worked before at all