Add ONDEMAND_2_PHASE back again