Revert "Merge branch 'demo'"

This reverts commit 78f3ac2cb006e9c930e4873cac7168b4e8502e55.