Revert "Rejig forced hosts some more - closes #927"

This reverts commit 72cadac76e1236a1e1b678642926de6562078277.
Revert "Fix #872 - use default server if forced host not found, OR force default is set."

This reverts commit 1fb7a3bf1d6d0fe1e5a84897e26111b96ccc9017.