Revert "Drop host prefix"

This reverts commit f5c36662303594f4dcb71ce5272895d29ff963c1.