Revert "Add public API - Attempt two"

This reverts commit f6c9a74cbb661c5dbf84f53192ddba9ba342e52e.