Bknowles 23 fix fqdn bomb

Gack.  I tried to squash all these commits, so that you wouldn't have to see all my stupid debugging errors, but I seem to have failed in that task.

Let me know if you want me to try squashing again, or if this PR is acceptable.  Thanks!