Wish list item #7: Corruption snapback