#1940 Revert Prefix import to Address. See merge request !6787 (cherry picked from commit 465e060e) a2795170 Revert Prefix import to Address.