Merge "SpecialUndelete: Follow-up to 6cf13604aec40e2210c16ccdbeba850de9428d19"