This reverts commit 5bd969693c.
5bd969693c
cleaned up various dependencies and exports from some of the libraries