Revert "Add missing public entries and fix up symbols"

This reverts commit 99cf5f14f425b8d2bd27360f8f2bcd77863b3689.