Revert "Add missing public entries and fix up symbols"

This reverts commit b698ee0d38150ab12daa14c5e11016f9fa8b9c80.