Alternative implementation for vhost
Merge bug 25539