Revert "Merge branch 'nicklewis-rcS-is-a-jerk' into stable"

This reverts commit ea548f68bac581d1d0a2e2e95738d73f658b3896, reversing
changes made to d6e6e9d51a92cba2e5dcace4b48949d1f77663b9.

Reverting because the acceptance tests is failing :(

https://jenkins.puppetlabs.com/view/Puppet%20FOSS/view/Master/job/Puppet%20Acceptance%20(master)/label=acceptance,platform=centos/767/console