Revert "Support both API versions"

This reverts commit 8519926639b9ab9e73a1ab5bc8afa2c84f8068c8.