Revert "remove conflicting libraries"

This reverts commit 168e58174dacb0d8557cf941852e884196720084.