Revert "Add missing public entries and fix up symbols"

This reverts commit f2827b7a4ba82b5854f2d3f8d826d2a703cce38b.