Revert "Revert "lib""

This reverts commit 71c9e100dc0527e9d486aaa7998ec7dcd953c433.