Reverted r2613 and started a new hvirt branch on the invirt-base pkg