Revert "Pseudo-syncronous API"

Prepare for upcoming release

This reverts commit 5a00a3b150b9d68999697c37275acd7828ca9a70.

Change-Id: I8cd3b1022e86f0f44b0d42cf48c2ba8dd40b8b93