Revert v1
The v1 API changes accidentally were released as v0.5.9 and v0.5.10. This reverts those changes and cherry picks the fixes.
The v1 API changes accidentally were released as v0.5.9 and v0.5.10. This reverts those changes and cherry picks the fixes.