Over on this comment thread, we figured that the way we reconcile when a revision has both been deleted and restored may be innacurate, as the timing is important to know whether it is visible or not.

In this task we should revisa that code and change it if neccesary.