This breaks cyclic imports and also allow cleaner separation between backup make and restore code. No functional change.