Revert "Fix API for C compatibility"

This reverts commit b473061c5a1b6e609188310e8d63f12380b4c74a.

Reason for revert: new API is no longer used

Change-Id: I2c4f9f37736faeb5d0403c2ba531c792d2531505
2 files changed