Revert "Changed the public API"