restore internal builder stuff