Revert "Merge branch 'facter-2'"

This reverts commit c3ae5259fb57c853428fe83b5158f3a00dd2db51, reversing
changes made to e8ab81eb1bbbff1e8dc8e64ba3be9c89b57d7036.
(maint) Properly merge up c3ae525

The merge commit in c3ae525 was completely broken, this commit actually
merges the revert commit.
Merge branch 'revert/master/partition-uuid-revert-merge'