Added back original API, added another comment