That 'refactor' a while back broke VM building.