== undeletion == 

 I don't really need it; I just thought it would be helpful in the merge (I don't really know what state it was in).  If it's that bad, then I won't bother using it, so it doesn't need undeletion.