Revert "Simple changes with latest libs to show it working."

This reverts commit b0736738eec7d56b7efa89ea6de31530982dbd19.