Revert "Changes according to new API v2"

This reverts commit 61e4f863013c8ebec73dd0d9f83ff44be50d349b.