Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"

This reverts commit 658bdb72bee3ad664627a71793213e6540afd5cb, reversing
changes made to 4c9bd43bc2f5fde9d86196e8689dced929d39aad.

See comment at http://projects.puppetlabs.com/issues/5605#note-9