Split virt2 away from other virt nodes

Change-Id: I2792c881d9831a9259798e45cd1cbc4f0a3b0eef