Revert 78669e468053e70c8348087ccd547939951bb3dd was breaking demos on
pull request