PRD-4625: Need registerdefaults to be safe in all cases