Revert "Fixes #5560 Base primary server search on a records to be able to find it even in a other zone"

This reverts commit c01d4a6f.