Fixing failed hunks caused by recent removal of delete_one().