Revert "Getting rid of API stuff 2/2"

This reverts commit e9cb970763765fc7f0495d17eb001bf72082470f.
Revert "Getting rid of API stuff 1/2"

This reverts commit 534f7bc4ecb3fd33cd11f7995e13045099716d30.