Revert "to be fixed"

This reverts commit b7d4380faf1ecfa380797f9d6c8e4e21f3582e8f.
Revert "Revert "to be fixed""

This reverts commit de365baaeb62787908a464e7678202498870b4dd.
finalized puppet