Revert "Change APIs"

This reverts commit 85cb931d8fe728b08422e820052d8b35ba4ac29c.