Revert "Delete some lib stuff ..."

This reverts commit 548206735a2b4fae18e0ed4f4b47ca626897c3bf.