Remove hack for panopoly_demo version