Revert "Fancy new demos", was meant to go in another branch

This reverts commit 5027ac8e8783011a246f99832c137aa57fa42da9.