Revert "Add setting for PreserveFQDN"

This reverts commit f4171301601c2bc6199779f621778755abf19e5d.