Fixes #10873 Remove some obsolete compatibility functions that are no longer in the latest release, and stop re-exporting symbols that clearly weren't meant to be re-exported.