Revert "Merge branch 'pull-419' into 1.7.x"

Facter 1.7 is in RC; this is being reverted to avoid delaying 1.7.0.

This reverts commit 229fca73ac31e33534c8be3e0322345a3b07cc95, reversing
changes made to b7784a3af80c70a833dfd3de1fa32dc1eb62384e.
Merge branch '1.7.x'
Revert "Revert "Merge branch 'pull-419' into 1.7.x""

This revert serves to move GH-419 into master.

This reverts commit 08188324fe44efc5e93defb2ee49955d825f3a02.