Revert "* Fixes NB#96696, do not export too many symbols"