Revert "Intentionally break puppet compile for virt1008"

So... I'm reverting this so I can properly apply the
icinga patch to virt1008, and then I'm going to reapply it.

Etc.

This reverts commit 8e5ec5920f75aff7456be62170bc3e990444295c.

Change-Id: I7d6ab9e38a9486f5ffc5d9bcf3056f899e2dc3fd
Merge "Revert "Intentionally break puppet compile for virt1008"" into production