Revert "more cleaning up since we are building from source"

This reverts commit 1ab0fa59a74a3d8e402f2464854b758a92b1650e.