puppetlabs/puppet — pull request #3186 by ferventcoder (2014-10-13 18:10:55+00:00)
Title: Ticket/stable/pup 3244 revert

This reverts the merge from two PRs that stepped on each other a bit.