Revert "Merge pull request #239 from peregrinogris/3rdParty"

This reverts commit cd53dcabddd5a930b0b639325575e224a3c6b5e4, reversing
changes made to 3aa8cd41839e8e6a9e6cad2a911799f49e2b8af1.