Isn't this still cleared on undo? I suspect this block is still necessary.