Revert "Update with last Puppet references"

Temporary revert, some puppet issues need to be fixed.
This reverts commit 3b65c41e483f7e3381e842eb27b3ef5f5fb81296.