Revert "Merge branch 'ticket/10081' of git://github.com/jgrocho/puppet"

This reverts commit cd36fce381ab17db99469d6afacc2b8d420abea3, reversing
changes made to 94c5cd31148aef4c7b9cce1aab36bdeb39c5b508.

This was causing problems running rake, since Rubygems would end up
with a version along the lines of '2.7.6-265-gcd36fce', which it did
not like at all.c