Revert "New API response scheme"

This reverts commit b6f06d6a1412545cc750d037c7be010b68aa6b61.