Revert back to dae29671f99227c0ead1033402445d1dcd948cef
Merge pull request #1 from puppetlabs-operations/upstream-master

Revert back to dae29671f99227c0ead1033402445d1dcd948cef