Merge pull request #711 from icann-dns/fix_legacy_functions