Make novsite work as vsite.

WIP
#4132