undo overzealous factoring - enforce v4/v6 behaviour only applies for registration helpers