Revert "Intentionally break puppet compile for virt1008"

This reverts commit 2bdd837f586651340003bab677cb31b07ebe2a4a.

We're going through another round of this.  Whee!

Change-Id: I454beccec6bae72ad01d626b495398d59c7bb976