Improve interrupted version restore recovery (#4312)