* Revert "Fixed creation of C++ wrappers from old API (#5805)"
This reverts commit ffe03b6ed3.
* Removed deprecated API
* Fixes 2
* Revert "Fixed creation of C++ wrappers from old API (#5805)"
This reverts commit ffe03b6ed3.
* Removed deprecated API
* Fixes 2