Backout Bug 860235 - puppet is busted and I want to completely rule out this as a cause