Revert "minor puppet refactoring"
Revert "minor puppet refactoring"

This reverts commit e47be04c107ed974c3a3ceaaa2d444f8bd28f59a.

dwalldorf/owTracker,dwalldorf/owTracker,dwalldorf/owTracker,dwalldorf/owTracker,dwalldorf/owTracker