Revert "Library updates"

This reverts commit ff9bb95d7dd7a0d316669fc6a519ab4ab06e3d18.