[minor] Work on restoring the old API