Currently only working for Puppet 2.6.18
More changes...