Revert "virt1007 is new aggregator"

This reverts commit f92f5623169dd93bfd6722bb240e3bec885b7cba.

Change-Id: I13539ade80f117574e4cdfe463188148b1102dd6
Merge "Revert "virt1007 is new aggregator"" into production