Merge pull request #808 from puppetlabs/revert-801-modules6408