Revert all the changes in demo.cpp that were never supposed to be there in the last...