Awful hacks to make Puppet work are nothing new...

Change-Id: Iffd21658576c77b731b53a9139a8de2fe541fe38
Merge "Awful hacks to make Puppet work are nothing new..." into production