Apply Chih's DataplaneDrop patch