remove my dumb debugging puts
Merge branch 'master' into default-retry-count