Revert "Update C++ demo to new upstream changes"