@Ferdi do we want to deal with non-vsite installs as-well?