Move recovery stuff to montblanc-common