Merge "Fix undeletion write-both/read-old mode."