Revert "fix(libraries): backport of merge 00937be7"

This reverts commit 39664600c1f0d4caafd3f700c40d11c605acb9b2.