Instead of DEMAND_PRUNE, leave DEMAND as default, and create a DEMAND_NO_PRUNE with old features