[RFC 12/16] NOVA: Recovery code