Revert "Merge branch 'api_v2'"

This reverts commit a950268af20a675ae44e6a6d3c7278eed1dfbbee, reversing
changes made to 32e796a3f9324aee8a8a87e837ec68fee42d0f22.