Long overdue phenny puppet commit