Revert "Fix fqdn and domain in attributes"

This reverts commit dd9d3e8748f1291336536ec90644aa60fd30c0fd.