Revert libraries.
Merging origin/goliver/master-pending-library-revert into master