Revert "Currently the 2.1 agent API is still compatible with 2.0-stable"

This reverts commit 3064390a83427424b62d5ea972ca92c100ae85c0.