Revert the third attempt at fixing libraries.
Merging origin/goliver/master-pending-library-revert-3 into master