Revert "Fix canonical hostname."

This reverts commit 0467d21cd4652dce6bd4f099ce9f12ff00834a65.