Revert "Port Demo Support from r00ts builds"

This reverts commit 4b296e8733d4dcfbd3c14f9382a5c3f7069fc078.