Followup to f2b7cfc5e0d1f5aa7f38f54360f13cf79a20be6b

I really don't want puppet running during the build process!

Change-Id: Ide8d48e66358d70ee27f5252ccda921619f90d0d