I think we have a sane state on the puppet master, and therefore this can go back to the original attempt.