Fix for dependency cycle when default_vhost false

This is an ugly hack.