Revert "Merge branch 'feature/apiclient' into feature/gcc4.7-support"

This reverts commit cd980cdb1ddbd2ddd37cf38cf0a4fabfcb18068f, reversing
changes made to 97b22b84701ba9a4034f1742377752c6251b3850.